diff --git a/.pydevproject b/.pydevproject
index 416319d077..fba36e6fb7 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -5,9 +5,5 @@
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/calibre/src</path>
-<path>/calibre/devices</path>
-<path>/calibre/libprs500.devices.prs500</path>
-<path>/calibre/prs500</path>
-<path>/calibre/gui2</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/installer/cx_Freeze/HISTORY.txt b/installer/cx_Freeze/HISTORY.txt
new file mode 100644
index 0000000000..acf9ad0dfe
--- /dev/null
+++ b/installer/cx_Freeze/HISTORY.txt
@@ -0,0 +1,244 @@
+Changes from 4.0 to 4.0.1
+ 1) Added support for Python 2.6. On Windows a manifest file is now required
+    because of the switch to using the new Microsoft C runtime.
+ 2) Ensure that hooks are run for builtin modules.
+
+Changes from 4.0b1 to 4.0
+ 1) Added support for copying files to the target directory.
+ 2) Added support for a hook that runs when a module is missing.
+ 3) Added support for binary path includes as well as excludes; use sequences
+    rather than dictionaries as a more convenient API; exclude the standard
+    locations for 32-bit and 64-bit libaries in multi-architecture systems.
+ 4) Added support for searching zip files (egg files) for modules.
+ 5) Added support for handling system exit exceptions similarly to what Python
+    does itself as requested by Sylvain.
+ 6) Added code to wait for threads to shut down like the normal Python
+    interpreter does. Thanks to Mariano Disanzo for discovering this
+    discrepancy.
+ 7) Hooks added or modified based on feedback from many people.
+ 8) Don't include the version name in the display name of the MSI.
+ 9) Use the OS dependent path normalization routines rather than simply use the
+    lowercase value as on Unix case is important; thanks to Artie Eoff for
+    pointing this out.
+10) Include a version attribute in the cx_Freeze package and display it in the
+    output for the --version option to the script.
+11) Include build instructions as requested by Norbert Sebok.
+12) Add support for copying files when modules are included which require data
+    files to operate properly; add support for copying the necessary files for
+    the Tkinter and matplotlib modules.
+13) Handle deferred imports recursively as needed; ensure that from lists do
+    not automatically indicate that they are part of the module or the deferred
+    import processing doesn't actually work!
+14) Handle the situation where a module imports everything from a package and
+    the __all__ variable has been defined but the package has not actually
+    imported everything in the __all__ variable during initialization.
+15) Modified license text to more closely match the Python Software Foundation
+    license as was intended.
+16) Added sample script for freezing an application using matplotlib.
+17) Renamed freeze to cxfreeze to avoid conflict with another package that uses
+    that executable as requested by Siegfried Gevatter.
+
+Changes from 3.0.3 to 4.0b1
+ 1) Added support for placing modules in library.zip or in a separate zip file
+    for each executable that is produced.
+ 2) Added support for copying binary dependent files (DLLs and shared
+    libraries)
+ 3) Added support for including all submodules in a package
+ 4) Added support for including icons in Windows executables
+ 5) Added support for constants module which can be used for determining
+    certain build constants at runtime
+ 6) Added support for relative imports available in Python 2.5 and up
+ 7) Added support for building Windows installers (Python 2.5 and up) and
+    RPM packages
+ 8) Added support for distutils configuration scripts
+ 9) Added support for hooks which can force inclusion or exclusion of modules
+    when certain modules are included
+10) Added documentation and samples
+11) Added setup.py for building the cx_Freeze package instead of a script
+    used to build only the frozen bases
+12) FreezePython renamed to a script called freeze in the Python distribution
+13) On Linux and other platforms that support it set LD_RUN_PATH to include
+    the directory in which the executable is located
+
+Changes from 3.0.2 to 3.0.3
+ 1) In Common.c, used MAXPATHLEN defined in the Python OS independent include
+    file rather than the PATH_MAX define which is OS dependent and is not
+    available on IRIX as noted by Andrew Jones.
+ 2) In the initscript ConsoleSetLibPath.py, added lines from initscript
+    Console.py that should have been there since the only difference between
+    that script and this one is the automatic re-execution of the executable.
+ 3) Added an explicit "import encodings" to the initscripts in order to handle
+    Unicode encodings a little better. Thanks to Ralf Schmitt for pointing out
+    the problem and its solution.
+ 4) Generated a meaningful name for the extension loader script so that it is
+    clear which particular extension module is being loaded when an exception
+    is being raised.
+ 5) In MakeFrozenBases.py, use distutils to figure out a few more
+    platform-dependent linker flags as suggested by Ralf Schmitt.
+
+Changes from 3.0.1 to 3.0.2
+ 1) Add support for compressing the byte code in the zip files that are
+    produced.
+ 2) Add better support for the win32com package as requested by Barry Scott.
+ 3) Prevent deletion of target file if it happens to be identical to the
+    source file.
+ 4) Include additional flags for local modifications to a Python build as
+    suggested by Benjamin Rutt.
+ 5) Expanded instructions for building cx_Freeze from source based on a
+    suggestion from Gregg Lind.
+ 6) Fix typo in help string.
+
+Changes from 3.0 to 3.0.1
+ 1) Added option --default-path which is used to specify the path used when
+    finding modules. This is particularly useful when performing cross
+    compilations (such as for building a frozen executable for Windows CE).
+ 2) Added option --shared-lib-name which can be used to specify the name of
+    the shared library (DLL) implementing the Python runtime that is required
+    for the frozen executable to work. This option is also particularly useful
+    when cross compiling since the normal method for determining this
+    information cannot be used.
+ 3) Added option --zip-include which allows for additional files to be added
+    to the zip file that contains the modules that implement the Python
+    script. Thanks to Barray Warsaw for providing the initial patch.
+ 4) Added support for handling read-only files properly. Thanks to Peter
+    Grayson for pointing out the problem and providing a solution.
+ 5) Added support for a frozen executable to be a symbolic link. Thanks to
+    Robert Kiendl for providing the initial patch.
+ 6) Enhanced the support for running a frozen executable that uses an existing
+    Python installation to locate modules it requires. This is primarily of
+    use for embedding Python where the interface is C but the ability to run
+    from source is still desired.
+ 7) Modified the documentation to indicate that building from source on
+    Windows currently requires the mingw compiler (http://www.mingw.org).
+ 8) Workaround the problem in Python 2.3 (fixed in Python 2.4) which causes a
+    broken module to be left in sys.modules if an ImportError takes place
+    during the execution of the code in that module. Thanks to Roger Binns
+    for pointing this out.
+
+Changes from 3.0 beta3 to 3.0
+ 1) Ensure that ldd is only run on extension modules.
+ 2) Allow for using a compiler other than gcc for building the frozen base
+    executables by setting the environment variable CC.
+ 3) Ensure that the import lock is not held while executing the main script;
+    otherwise, attempts to import a module within a thread will hang that
+    thread as noted by Roger Binns.
+ 4) Added support for replacing the paths in all frozen modules with something
+    else (so that for example the path of the machine on which the freezing
+    was done is not displayed in tracebacks)
+
+Changes from 3.0 beta2 to 3.0 beta3
+ 1) Explicitly include the warnings module so that at runtime warnings are
+    suppressed as when running Python normally.
+ 2) Improve the extension loader so that an ImportError is raised when the
+    dynamic module is not located; otherwise an error about missing attributes
+    is raised instead.
+ 3) Extension loaders are only created when copying dependencies since the
+    normal module should be loadable in the situation where a Python
+    installation is available.
+ 4) Added support for Python 2.4.
+ 5) Fixed the dependency checking for wxPython to be a little more
+    intelligent.
+
+Changes from 3.0 beta1 to 3.0 beta2
+ 1) Fix issues with locating the initscripts and bases relative to the
+    directory in which the executable was started.
+ 2) Added new base executable ConsoleKeepPath which is used when an existing
+    Python installation is required (such as for FreezePython itself).
+ 3) Forced the existence of a Python installation to be ignored when using the
+    standard Console base executable.
+ 4) Remove the existing file when copying dependent files; otherwise, an error
+    is raised when attempting to overwrite read-only files.
+ 5) Added option -O (or -OO) to FreezePython to set the optimization used when
+    generating bytecode.
+
+Changes from 2.2 to 3.0 beta1
+ 1) cx_Freeze now requires Python 2.3 or higher since it takes advantage of
+    the ability of Python 2.3 and higher to import modules from zip files.
+    This makes the freezing process considerably simpler and also allows for
+    the execution of multiple frozen packages (such as found in COM servers or
+    shared libraries) without requiring modification to the Python modules.
+ 2) All external dependencies have been removed. cx_Freeze now only requires
+    a standard Python distribution to do its work.
+ 3) Added the ability to define the initialization scripts that cx_Freeze uses
+    on startup of the frozen program. Previously, these scripts were written
+    in C and could not easily be changed; now they are written in Python and
+    can be found in the initscripts directory (and chosen with the
+    new --init-script option to FreezePython).
+ 4) The base executable ConsoleSetLibPath has been removed and replaced with
+    the initscript ConsoleSetLibPath.
+ 5) Removed base executables for Win32 services and Win32 COM servers. This
+    functionality will be restored in the future but it is not currently in a
+    state that is ready for release. If this functionality is required, please
+    use py2exe or contact me for my work in progress.
+ 6) The attribute sys.frozen is now set so that more recent pywin32 modules
+    work as expected when frozen.
+ 7) Added option --include-path to FreezePython to allow overriding of
+    sys.path without modifying the environment variable PYTHONPATH.
+ 8) Added option --target-dir/--install-dir to specify the directory in which
+    the frozen executable and its dependencies will be placed.
+ 9) Removed the option --shared-lib since it was used for building shared
+    libraries and can be managed with the initscript SharedLib.py.
+10) MakeFrozenBases.py now checks the platform specific include directory as
+    requested by Michael Partridge.
+
+
+Changes from 2.1 to 2.2
+ 1) Add option (--ext-list-file) to FreezePython to write the list of
+    extensions copied to the installation directory to a file. This option is
+    useful in cases where multiple builds are performed into the same
+    installation directory.
+ 2) Pass the arguments on the command line through to Win32 GUI applications.
+    Thanks to Michael Porter for pointing this out.
+ 3) Link directly against the python DLL when building the frozen bases on
+    Windows, thus eliminating the need for building an import library.
+ 4) Force sys.path to include the directory in which the script to be frozen
+    is found.
+ 5) Make sure that the installation directory exists before attempting to
+    copy the target binary into it.
+ 6) The Win32GUI base has been modified to display fatal errors in message
+    boxes, rather than printing errors to stderr, since on Windows the
+    standard file IO handles are all closed.
+
+Changes from 2.0 to 2.1
+ 1) Remove dependency on Python 2.2. Thanks to Paul Moore for not only
+    pointing it out but providing patches.
+ 2) Set up the list of frozen modules in advance, rather than doing it after
+    Python is initialized so that implicit imports done by Python can be
+    satisfied. The bug in Python 2.3 that demonstrated this issue has been
+    fixed in the first release candidate. Thanks to Thomas Heller for pointing
+    out the obvious in this instance!
+ 3) Added additional base executable (ConsoleSetLibPath) to support setting
+    the LD_LIBRARY_PATH variable on Unix platforms and restarting the
+    executable to put the new setting into effect. This is primarily of use
+    in distributing wxPython applications on Unix where the shared library
+    has an embedded RPATH value which can cause problems.
+ 4) Small improvements of documentation based on feedback from several people.
+ 5) Print information about the files written or copied during the freezing
+    process.
+ 6) Do not copy extensions when freezing if the path is being overridden since
+    it is expected that a full Python installation is available to the target
+    users of the frozen binary.
+ 7) Provide meaningful error message when the wxPython library cannot be
+    found during the freezing process.
+
+Changes from 1.1 to 2.0
+ 1) Added support for in process (DLL) COM servers using PythonCOM.
+ 2) Ensured that the frozen flag is set prior to determining the full path for
+    the program in order to avoid warnings about Python not being found on
+    some platforms.
+ 3) Added include file and resource file to the source tree to avoid the
+    dependency on the Wine message compiler for Win32 builds.
+ 4) Dropped the option --copy-extensions; this now happens automatically since
+    the resulting binary is useless without them.
+ 5) Added a sample for building a Win32 service.
+ 6) Make use of improved modules from Python 2.3 (which function under 2.2)
+
+Changes from 1.0 to 1.1
+ 1) Fixed import error with C extensions in packages; thanks to Thomas Heller
+    for pointing out the solution to this problem.
+ 2) Added options to FreezePython to allow for the inclusion of modules which
+    will not be found by the module finder (--include-modules) and the
+    exclusion of modules which will be found by the module finder but should
+    not be included (--exclude-modules).
+ 3) Fixed typo in README.txt.
+
diff --git a/installer/cx_Freeze/LICENSE.txt b/installer/cx_Freeze/LICENSE.txt
new file mode 100644
index 0000000000..cb9ee05a8a
--- /dev/null
+++ b/installer/cx_Freeze/LICENSE.txt
@@ -0,0 +1,53 @@
+Copyright © 2007-2008, Colt Engineering, Edmonton, Alberta, Canada.
+Copyright © 2001-2006, Computronix (Canada) Ltd., Edmonton, Alberta, Canada.
+All rights reserved.
+
+NOTE: this license is derived from the Python Software Foundation License
+which can be found at http://www.python.org/psf/license
+
+License for cx_Freeze 4.0.1
+---------------------------
+
+1. This LICENSE AGREEMENT is between the copyright holders and the Individual
+   or Organization ("Licensee") accessing and otherwise using cx_Freeze
+   software in source or binary form and its associated documentation.
+
+2. Subject to the terms and conditions of this License Agreement, the
+   copyright holders hereby grant Licensee a nonexclusive, royalty-free,
+   world-wide license to reproduce, analyze, test, perform and/or display
+   publicly, prepare derivative works, distribute, and otherwise use cx_Freeze
+   alone or in any derivative version, provided, however, that this License
+   Agreement and this notice of copyright are retained in cx_Freeze alone or in
+   any derivative version prepared by Licensee.
+
+3. In the event Licensee prepares a derivative work that is based on or
+   incorporates cx_Freeze or any part thereof, and wants to make the derivative
+   work available to others as provided herein, then Licensee hereby agrees to
+   include in any such work a brief summary of the changes made to cx_Freeze.
+
+4. The copyright holders are making cx_Freeze available to Licensee on an
+   "AS IS" basis.  THE COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES,
+   EXPRESS OR IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, THE COPYRIGHT
+   HOLDERS MAKE NO AND DISCLAIM ANY REPRESENTATION OR WARRANTY OF
+   MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF
+   CX_FREEZE WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
+
+5. THE COPYRIGHT HOLDERS SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF
+   CX_FREEZE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+   A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING CX_FREEZE, OR ANY
+   DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+
+6. This License Agreement will automatically terminate upon a material breach
+   of its terms and conditions.
+
+7. Nothing in this License Agreement shall be deemed to create any relationship
+   of agency, partnership, or joint venture between the copyright holders and
+   Licensee.  This License Agreement does not grant permission to use
+   copyright holder's trademarks or trade name in a trademark sense to endorse
+   or promote products or services of Licensee, or any third party.
+
+8. By copying, installing or otherwise using cx_Freeze, Licensee agrees to be
+   bound by the terms and conditions of this License Agreement.
+
+Computronix® is a registered trademark of Computronix (Canada) Ltd.
+
diff --git a/installer/cx_Freeze/MANIFEST.in b/installer/cx_Freeze/MANIFEST.in
new file mode 100644
index 0000000000..2348a66973
--- /dev/null
+++ b/installer/cx_Freeze/MANIFEST.in
@@ -0,0 +1,6 @@
+include MANIFEST.in
+include *.txt
+recursive-include doc *.html
+recursive-include initscripts *.py
+recursive-include samples *.py
+recursive-include source *.c *.rc
diff --git a/installer/cx_Freeze/PKG-INFO b/installer/cx_Freeze/PKG-INFO
new file mode 100644
index 0000000000..aa53b57914
--- /dev/null
+++ b/installer/cx_Freeze/PKG-INFO
@@ -0,0 +1,22 @@
+Metadata-Version: 1.0
+Name: cx_Freeze
+Version: 4.0.1
+Summary: create standalone executables from Python scripts
+Home-page: http://cx-freeze.sourceforge.net
+Author: Anthony Tuininga
+Author-email: anthony.tuininga@gmail.com
+License: Python Software Foundation License
+Description: create standalone executables from Python scripts
+Keywords: freeze
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: Python Software Foundation License
+Classifier: Natural Language :: English
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: C
+Classifier: Programming Language :: Python
+Classifier: Topic :: Software Development :: Build Tools
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: System :: Software Distribution
+Classifier: Topic :: Utilities
diff --git a/installer/cx_Freeze/README.txt b/installer/cx_Freeze/README.txt
new file mode 100644
index 0000000000..1ac67dc749
--- /dev/null
+++ b/installer/cx_Freeze/README.txt
@@ -0,0 +1,12 @@
+Please see cx_Freeze.html for documentation on how to use cx_Freeze.
+
+To build:
+
+python setup.py build
+python setup.py install
+
+On Windows I have used the MinGW compiler (http://www.mingw.org)
+
+python setup.py build --compiler=mingw32
+python setup.py build --compiler=mingw32 install
+
diff --git a/installer/cx_Freeze/cx_Freeze/__init__.py b/installer/cx_Freeze/cx_Freeze/__init__.py
new file mode 100644
index 0000000000..545883eb3e
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/__init__.py
@@ -0,0 +1,14 @@
+version = "4.0.1"
+
+import sys
+from dist import *
+if sys.platform == "win32" and sys.version_info[:2] >= (2, 5):
+    from windist import *
+from finder import *
+from freezer import *
+from main import *
+
+del dist
+del finder
+del freezer
+
diff --git a/installer/cx_Freeze/cx_Freeze/dist.py b/installer/cx_Freeze/cx_Freeze/dist.py
new file mode 100644
index 0000000000..c2af2ac623
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/dist.py
@@ -0,0 +1,279 @@
+import distutils.command.bdist_rpm
+import distutils.command.build
+import distutils.command.install
+import distutils.core
+import distutils.dir_util
+import distutils.dist
+import distutils.util
+import distutils.version
+import os
+import sys
+
+import cx_Freeze
+
+__all__ = [ "bdist_rpm", "build", "build_exe", "install", "install_exe",
+            "setup" ]
+
+class Distribution(distutils.dist.Distribution):
+
+    def __init__(self, attrs):
+        self.executables = []
+        distutils.dist.Distribution.__init__(self, attrs)
+
+
+class bdist_rpm(distutils.command.bdist_rpm.bdist_rpm):
+
+    def finalize_options(self):
+        distutils.command.bdist_rpm.bdist_rpm.finalize_options(self)
+        self.use_rpm_opt_flags = 1
+
+    def _make_spec_file(self):
+        contents = distutils.command.bdist_rpm.bdist_rpm._make_spec_file(self)
+        return [c for c in contents if c != 'BuildArch: noarch']
+
+
+class build(distutils.command.build.build):
+    user_options = distutils.command.build.build.user_options + [
+        ('build-exe=', None, 'build directory for executables')
+    ]
+
+    def get_sub_commands(self):
+        subCommands = distutils.command.build.build.get_sub_commands(self)
+        if self.distribution.executables:
+            subCommands.append("build_exe")
+        return subCommands
+
+    def initialize_options(self):
+        distutils.command.build.build.initialize_options(self)
+        self.build_exe = None
+
+    def finalize_options(self):
+        distutils.command.build.build.finalize_options(self)
+        if self.build_exe is None:
+            dirName = "exe.%s-%s" % \
+                    (distutils.util.get_platform(), sys.version[0:3])
+            self.build_exe = os.path.join(self.build_base, dirName)
+
+
+class build_exe(distutils.core.Command):
+    description = "build executables from Python scripts"
+    user_options = [
+        ('build-exe=', 'b',
+         'directory for built executables'),
+        ('optimize=', 'O',
+         'optimization level: -O1 for "python -O", '
+         '-O2 for "python -OO" and -O0 to disable [default: -O0]'),
+        ('excludes=', 'e',
+         'comma-separated list of modules to exclude'),
+        ('includes=', 'i',
+         'comma-separated list of modules to include'),
+        ('packages=', 'p',
+         'comma-separated list of packages to include'),
+        ('replace-paths=', None,
+         'comma-separated list of paths to replace in included modules'),
+        ('path=', None,
+         'comma-separated list of paths to search'),
+        ('init-script=', 'i',
+         'name of script to use during initialization'),
+        ('base=', None,
+         'name of base executable to use'),
+        ('compressed', 'c',
+         'create a compressed zipfile'),
+        ('copy-dependent-files', None,
+         'copy all dependent files'),
+        ('create-shared-zip', None,
+         'create a shared zip file containing shared modules'),
+        ('append-script-to-exe', None,
+         'append the script module to the exe'),
+        ('include-in-shared-zip', None,
+         'include the script module in the shared zip file'),
+        ('icon', None,
+         'include the icon along with the frozen executable(s)'),
+        ('constants=', None,
+         'comma-separated list of constants to include'),
+        ('include-files=', 'f',
+         'list of tuples of additional files to include in distribution'),
+        ('bin-includes', None,
+         'list of names of files to include when determining dependencies'),
+        ('bin-excludes', None,
+         'list of names of files to exclude when determining dependencies')
+    ]
+    boolean_options = ["compressed", "copy_dependent_files",
+            "create_shared_zip", "append_script_to_exe",
+            "include_in_shared_zip"]
+
+    def _normalize(self, attrName):
+        value = getattr(self, attrName)
+        if value is None:
+            normalizedValue = []
+        elif isinstance(value, basestring):
+            normalizedValue = value.split()
+        else:
+            normalizedValue = list(value)
+        setattr(self, attrName, normalizedValue)
+
+    def initialize_options(self):
+        self.optimize = 0
+        self.build_exe = None
+        self.excludes = []
+        self.includes = []
+        self.packages = []
+        self.replace_paths = []
+        self.compressed = None
+        self.copy_dependent_files = None
+        self.init_script = None
+        self.base = None
+        self.path = None
+        self.create_shared_zip = None
+        self.append_script_to_exe = None
+        self.include_in_shared_zip = None
+        self.icon = None
+        self.constants = []
+        self.include_files = []
+        self.bin_excludes = []
+        self.bin_includes = []
+
+    def finalize_options(self):
+        self.set_undefined_options('build', ('build_exe', 'build_exe'))
+        self.optimize = int(self.optimize)
+        self._normalize("excludes")
+        self._normalize("includes")
+        self._normalize("packages")
+        self._normalize("constants")
+
+    def run(self):
+        metadata = self.distribution.metadata
+        constantsModule = cx_Freeze.ConstantsModule(metadata.version)
+        for constant in self.constants:
+            parts = constant.split("=")
+            if len(parts) == 1:
+                name = constant
+                value = None
+            else:
+                name, stringValue = parts
+                value = eval(stringValue)
+            constantsModule.values[name] = value
+        freezer = cx_Freeze.Freezer(self.distribution.executables,
+                [constantsModule], self.includes, self.excludes, self.packages,
+                self.replace_paths, self.compressed, self.optimize,
+                self.copy_dependent_files, self.init_script, self.base,
+                self.path, self.create_shared_zip, self.append_script_to_exe,
+                self.include_in_shared_zip, self.build_exe, icon = self.icon,
+                includeFiles = self.include_files,
+                binIncludes = self.bin_includes,
+                binExcludes = self.bin_excludes)
+        freezer.Freeze()
+
+
+class install(distutils.command.install.install):
+    user_options = distutils.command.install.install.user_options + [
+            ('install-exe=', None,
+             'installation directory for executables')
+    ]
+
+    def expand_dirs(self):
+        distutils.command.install.install.expand_dirs(self)
+        self._expand_attrs(['install_exe'])
+
+    def get_sub_commands(self):
+        subCommands = distutils.command.install.install.get_sub_commands(self)
+        if self.distribution.executables:
+            subCommands.append("install_exe")
+        return [s for s in subCommands if s != "install_egg_info"]
+
+    def initialize_options(self):
+        distutils.command.install.install.initialize_options(self)
+        self.install_exe = None
+
+    def finalize_options(self):
+        if self.prefix is None and sys.platform == "win32":
+            import _winreg
+            key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE,
+                    r"Software\Microsoft\Windows\CurrentVersion")
+            prefix = str(_winreg.QueryValueEx(key, "ProgramFilesDir")[0])
+            metadata = self.distribution.metadata
+            dirName = "%s-%s" % (metadata.name, metadata.version)
+            self.prefix = "%s/%s" % (prefix, dirName)
+        distutils.command.install.install.finalize_options(self)
+        self.convert_paths('exe')
+        if self.root is not None:
+            self.change_roots('exe')
+
+    def select_scheme(self, name):
+        distutils.command.install.install.select_scheme(self, name)
+        if self.install_exe is None:
+            if sys.platform == "win32":
+                self.install_exe = '$base'
+            else:
+                metadata = self.distribution.metadata
+                dirName = "%s-%s" % (metadata.name, metadata.version)
+                self.install_exe = '$base/lib/%s' % dirName
+
+
+class install_exe(distutils.core.Command):
+    description = "install executables built from Python scripts"
+    user_options = [
+        ('install-dir=', 'd', 'directory to install executables to'),
+        ('build-dir=', 'b', 'build directory (where to install from)'),
+        ('force', 'f', 'force installation (overwrite existing files)'),
+        ('skip-build', None, 'skip the build steps')
+    ]
+
+    def initialize_options(self):
+        self.install_dir = None
+        self.force = 0
+        self.build_dir = None
+        self.skip_build = None
+
+    def finalize_options(self):
+        self.set_undefined_options('build', ('build_exe', 'build_dir'))
+        self.set_undefined_options('install',
+                ('install_exe', 'install_dir'),
+                ('force', 'force'),
+                ('skip_build', 'skip_build'))
+
+    def run(self):
+        if not self.skip_build:
+            self.run_command('build_exe')
+        self.outfiles = self.copy_tree(self.build_dir, self.install_dir)
+        if sys.platform != "win32":
+            baseDir = os.path.dirname(os.path.dirname(self.install_dir))
+            binDir = os.path.join(baseDir, "bin")
+            if not os.path.exists(binDir):
+                os.makedirs(binDir)
+            sourceDir = os.path.join("..", self.install_dir[len(baseDir) + 1:])
+            for executable in self.distribution.executables:
+                name = os.path.basename(executable.targetName)
+                source = os.path.join(sourceDir, name)
+                target = os.path.join(binDir, name)
+                if os.path.exists(target):
+                    os.unlink(target)
+                os.symlink(source, target)
+                self.outfiles.append(target)
+
+    def get_inputs(self):
+        return self.distribution.executables or []
+
+    def get_outputs(self):
+        return self.outfiles or []
+
+
+def _AddCommandClass(commandClasses, name, cls):
+    if name not in commandClasses:
+        commandClasses[name] = cls
+
+
+def setup(**attrs):
+    attrs["distclass"] = Distribution
+    commandClasses = attrs.setdefault("cmdclass", {})
+    if sys.platform == "win32":
+        if sys.version_info[:2] >= (2, 5):
+            _AddCommandClass(commandClasses, "bdist_msi", cx_Freeze.bdist_msi)
+    else:
+        _AddCommandClass(commandClasses, "bdist_rpm", cx_Freeze.bdist_rpm)
+    _AddCommandClass(commandClasses, "build", build)
+    _AddCommandClass(commandClasses, "build_exe", build_exe)
+    _AddCommandClass(commandClasses, "install", install)
+    _AddCommandClass(commandClasses, "install_exe", install_exe)
+    distutils.core.setup(**attrs)
+
diff --git a/installer/cx_Freeze/cx_Freeze/finder.py b/installer/cx_Freeze/cx_Freeze/finder.py
new file mode 100644
index 0000000000..f815db97be
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/finder.py
@@ -0,0 +1,455 @@
+"""
+Base class for finding modules.
+"""
+
+import dis
+import imp
+import marshal
+import new
+import opcode
+import os
+import sys
+import zipfile
+
+import cx_Freeze.hooks
+
+BUILD_LIST = opcode.opmap["BUILD_LIST"]
+INPLACE_ADD = opcode.opmap["INPLACE_ADD"]
+LOAD_CONST = opcode.opmap["LOAD_CONST"]
+IMPORT_NAME = opcode.opmap["IMPORT_NAME"]
+IMPORT_FROM = opcode.opmap["IMPORT_FROM"]
+STORE_NAME = opcode.opmap["STORE_NAME"]
+STORE_GLOBAL = opcode.opmap["STORE_GLOBAL"]
+STORE_OPS = (STORE_NAME, STORE_GLOBAL)
+
+__all__ = [ "Module", "ModuleFinder" ]
+
+class ModuleFinder(object):
+
+    def __init__(self, includeFiles, excludes, path, replacePaths):
+        self.includeFiles = includeFiles
+        self.excludes = dict.fromkeys(excludes)
+        self.replacePaths = replacePaths
+        self.path = path or sys.path
+        self.modules = []
+        self.aliases = {}
+        self._modules = dict.fromkeys(excludes)
+        self._builtinModules = dict.fromkeys(sys.builtin_module_names)
+        self._badModules = {}
+        self._zipFileEntries = {}
+        self._zipFiles = {}
+        cx_Freeze.hooks.initialize(self)
+
+    def _AddModule(self, name):
+        """Add a module to the list of modules but if one is already found,
+           then return it instead; this is done so that packages can be
+           handled properly."""
+        module = self._modules.get(name)
+        if module is None:
+            module = self._modules[name] = Module(name)
+            self.modules.append(module)
+            if name in self._badModules:
+                del self._badModules[name]
+        return module
+
+    def _DetermineParent(self, caller):
+        """Determine the parent to use when searching packages."""
+        if caller is not None:
+            if caller.path is not None:
+                return caller
+            return self._GetParentByName(caller.name)
+
+    def _EnsureFromList(self, caller, packageModule, fromList,
+            deferredImports):
+        """Ensure that the from list is satisfied. This is only necessary for
+           package modules. If the caller is the package itself, actually
+           attempt to import right then since it must be a submodule; otherwise
+           defer until after all global names are defined in order to avoid
+           spurious complaints about missing modules."""
+        if caller is not packageModule:
+            deferredImports.append((packageModule, fromList))
+        else:
+            if fromList == ("*",):
+                fromList = packageModule.allNames
+            for name in fromList:
+                if name in packageModule.globalNames:
+                    continue
+                subModuleName = "%s.%s" % (packageModule.name, name)
+                self._ImportModule(subModuleName, deferredImports, caller)
+
+    def _FindModule(self, name, path):
+        try:
+            return imp.find_module(name, path)
+        except ImportError:
+            if not path:
+                path = []
+            for location in path:
+                if name in self._zipFileEntries:
+                    break
+                if location in self._zipFiles:
+                    continue
+                if os.path.isdir(location) or not zipfile.is_zipfile(location):
+                    self._zipFiles[location] = None
+                    continue
+                zip = zipfile.ZipFile(location)
+                for archiveName in zip.namelist():
+                    baseName, ext = os.path.splitext(archiveName)
+                    if ext not in ('.pyc', '.pyo'):
+                        continue
+                    moduleName = ".".join(baseName.split("/"))
+                    if moduleName in self._zipFileEntries:
+                        continue
+                    self._zipFileEntries[moduleName] = (zip, archiveName)
+                self._zipFiles[location] = None
+            info = self._zipFileEntries.get(name)
+            if info is not None:
+                zip, archiveName = info
+                fp = zip.read(archiveName)
+                info = (".pyc", "rb", imp.PY_COMPILED)
+                return fp, os.path.join(zip.filename, archiveName), info
+            raise
+
+    def _GetParentByName(self, name):
+        """Return the parent module given the name of a module."""
+        pos = name.rfind(".")
+        if pos > 0:
+            parentName = name[:pos]
+            return self._modules[parentName]
+
+    def _ImportAllSubModules(self, module, deferredImports, recursive = True):
+        """Import all sub modules to the given package."""
+        suffixes = dict.fromkeys([s[0] for s in imp.get_suffixes()])
+        for dir in module.path:
+            try:
+                fileNames = os.listdir(dir)
+            except os.error:
+                continue
+            for fileName in fileNames:
+                name, ext = os.path.splitext(fileName)
+                if ext not in suffixes:
+                    continue
+                if name == "__init__":
+                    continue
+                subModuleName = "%s.%s" % (module.name, name)
+                subModule, returnError = \
+                        self._InternalImportModule(subModuleName,
+                                deferredImports)
+                if returnError and subModule is None:
+                    raise ImportError, "No module named %s" % subModuleName
+                module.globalNames[name] = None
+                if subModule.path and recursive:
+                    self._ImportAllSubModules(subModule, deferredImports,
+                            recursive)
+
+    def _ImportDeferredImports(self, deferredImports):
+        """Import any sub modules that were deferred, if applicable."""
+        while deferredImports:
+            newDeferredImports = []
+            for packageModule, subModuleNames in deferredImports:
+                self._EnsureFromList(packageModule, packageModule,
+                        subModuleNames, newDeferredImports)
+            deferredImports = newDeferredImports
+
+    def _ImportModule(self, name, deferredImports, caller = None,
+            relativeImportIndex = 0):
+        """Attempt to find the named module and return it or None if no module
+           by that name could be found."""
+
+        # absolute import (available in Python 2.5 and up)
+        # the name given is the only name that will be searched
+        if relativeImportIndex == 0:
+            module, returnError = self._InternalImportModule(name,
+                    deferredImports)
+
+        # old style relative import (only possibility in Python 2.4 and prior)
+        # the name given is tried in all parents until a match is found and if
+        # no match is found, the global namespace is searched
+        elif relativeImportIndex < 0:
+            parent = self._DetermineParent(caller)
+            while parent is not None:
+                fullName = "%s.%s" % (parent.name, name)
+                module, returnError = self._InternalImportModule(fullName,
+                        deferredImports)
+                if module is not None:
+                    parent.globalNames[name] = None
+                    return module
+                parent = self._GetParentByName(parent.name)
+            module, returnError = self._InternalImportModule(name,
+                    deferredImports)
+
+        # new style relative import (available in Python 2.5 and up)
+        # the index indicates how many levels to traverse and only that level
+        # is searched for the named module
+        elif relativeImportIndex > 0:
+            parent = caller
+            if parent.path is not None:
+                relativeImportIndex -= 1
+            while parent is not None and relativeImportIndex > 0:
+                parent = self._GetParentByName(parent.name)
+                relativeImportIndex -= 1
+            if parent is None:
+                module = None
+                returnError = True
+            elif not name:
+                module = parent
+            else:
+                name = "%s.%s" % (parent.name, name)
+                module, returnError = self._InternalImportModule(name,
+                        deferredImports)
+
+        # if module not found, track that fact
+        if module is None:
+            if caller is None:
+                raise ImportError, "No module named %s" % name
+            self._RunHook("missing", name, caller)
+            if returnError and name not in caller.ignoreNames:
+                callers = self._badModules.setdefault(name, {})
+                callers[caller.name] = None
+
+        return module
+
+    def _InternalImportModule(self, name, deferredImports):
+        """Internal method used for importing a module which assumes that the
+           name given is an absolute name. None is returned if the module
+           cannot be found."""
+        try:
+            return self._modules[name], False
+        except KeyError:
+            pass
+        if name in self._builtinModules:
+            module = self._AddModule(name)
+            self._RunHook("load", module.name, module)
+            return module, False
+        pos = name.rfind(".")
+        if pos < 0:
+            path = self.path
+            searchName = name
+            parentModule = None
+        else:
+            parentName = name[:pos]
+            parentModule, returnError = \
+                    self._InternalImportModule(parentName, deferredImports)
+            if parentModule is None:
+                return None, returnError
+            path = parentModule.path
+            searchName = name[pos + 1:]
+        if name in self.aliases:
+            actualName = self.aliases[name]
+            module, returnError = \
+                    self._InternalImportModule(actualName, deferredImports)
+            self._modules[name] = module
+            return module, returnError
+        try:
+            fp, path, info = self._FindModule(searchName, path)
+        except ImportError:
+            self._modules[name] = None
+            return None, True
+        module = self._LoadModule(name, fp, path, info, deferredImports,
+                parentModule)
+        return module, False
+
+    def _LoadModule(self, name, fp, path, info, deferredImports,
+            parent = None):
+        """Load the module, given the information acquired by the finder."""
+        suffix, mode, type = info
+        if type == imp.PKG_DIRECTORY:
+            return self._LoadPackage(name, path, parent, deferredImports)
+        module = self._AddModule(name)
+        module.file = path
+        module.parent = parent
+        if type == imp.PY_SOURCE:
+            module.code = compile(fp.read() + "\n", path, "exec")
+        elif type == imp.PY_COMPILED:
+            if isinstance(fp, str):
+                magic = fp[:4]
+            else:
+                magic = fp.read(4)
+            if magic != imp.get_magic():
+                raise ImportError, "Bad magic number in %s" % path
+            if isinstance(fp, str):
+                module.code = marshal.loads(fp[8:])
+                module.inZipFile = True
+            else:
+                fp.read(4)
+                module.code = marshal.load(fp)
+        self._RunHook("load", module.name, module)
+        if module.code is not None:
+            if self.replacePaths:
+                topLevelModule = module
+                while topLevelModule.parent is not None:
+                    topLevelModule = topLevelModule.parent
+                module.code = self._ReplacePathsInCode(topLevelModule,
+                        module.code)
+            self._ScanCode(module.code, module, deferredImports)
+        return module
+
+    def _LoadPackage(self, name, path, parent, deferredImports):
+        """Load the package, given its name and path."""
+        module = self._AddModule(name)
+        module.path = [path]
+        fp, path, info = imp.find_module("__init__", module.path)
+        self._LoadModule(name, fp, path, info, deferredImports, parent)
+        return module
+
+    def _ReplacePathsInCode(self, topLevelModule, co):
+        """Replace paths in the code as directed, returning a new code object
+           with the modified paths in place."""
+        origFileName = newFileName = os.path.normpath(co.co_filename)
+        for searchValue, replaceValue in self.replacePaths:
+            if searchValue == "*":
+                searchValue = os.path.dirname(topLevelModule.file)
+                if topLevelModule.path:
+                    searchValue = os.path.dirname(searchValue)
+                if searchValue:
+                    searchValue = searchValue + os.pathsep
+            elif not origFileName.startswith(searchValue):
+                continue
+            newFileName = replaceValue + origFileName[len(searchValue):]
+            break
+        constants = list(co.co_consts)
+        for i, value in enumerate(constants):
+            if isinstance(value, type(co)):
+                constants[i] = self._ReplacePathsInCode(topLevelModule, value)
+        return new.code(co.co_argcount, co.co_nlocals, co.co_stacksize,
+                co.co_flags, co.co_code, tuple(constants), co.co_names,
+                co.co_varnames, newFileName, co.co_name, co.co_firstlineno,
+                co.co_lnotab, co.co_freevars, co.co_cellvars)
+
+    def _RunHook(self, hookName, moduleName, *args):
+        """Run hook for the given module if one is present."""
+        name = "%s_%s" % (hookName, moduleName.replace(".", "_"))
+        method = getattr(cx_Freeze.hooks, name, None)
+        if method is not None:
+            method(self, *args)
+
+    def _ScanCode(self, co, module, deferredImports):
+        """Scan code, looking for imported modules and keeping track of the
+           constants that have been created in order to better tell which
+           modules are truly missing."""
+        opIndex = 0
+        arguments = []
+        code = co.co_code
+        numOps = len(code)
+        while opIndex < numOps:
+            op = ord(code[opIndex])
+            opIndex += 1
+            if op >= dis.HAVE_ARGUMENT:
+                opArg = ord(code[opIndex]) + ord(code[opIndex + 1]) * 256
+                opIndex += 2
+            if op == LOAD_CONST:
+                arguments.append(co.co_consts[opArg])
+            elif op == IMPORT_NAME:
+                name = co.co_names[opArg]
+                if len(arguments) == 2:
+                    relativeImportIndex, fromList = arguments
+                else:
+                    relativeImportIndex = -1
+                    fromList, = arguments
+                if name not in module.excludeNames:
+                    subModule = self._ImportModule(name, deferredImports,
+                            module, relativeImportIndex)
+                    if subModule is not None:
+                        module.globalNames.update(subModule.globalNames)
+                        if fromList and subModule.path is not None:
+                            self._EnsureFromList(module, subModule, fromList,
+                                    deferredImports)
+            elif op == IMPORT_FROM:
+                opIndex += 3
+            elif op not in (BUILD_LIST, INPLACE_ADD):
+                if op in STORE_OPS:
+                    name = co.co_names[opArg]
+                    if name == "__all__":
+                        module.allNames.extend(arguments)
+                    module.globalNames[name] = None
+                arguments = []
+        for constant in co.co_consts:
+            if isinstance(constant, type(co)):
+                self._ScanCode(constant, module, deferredImports)
+
+    def AddAlias(self, name, aliasFor):
+        """Add an alias for a particular module; when an attempt is made to
+           import a module using the alias name, import the actual name
+           instead."""
+        self.aliases[name] = aliasFor
+
+    def ExcludeModule(self, name):
+        """Exclude the named module from the resulting frozen executable."""
+        self.excludes[name] = None
+        self._modules[name] = None
+
+    def IncludeFile(self, path, moduleName = None):
+        """Include the named file as a module in the frozen executable."""
+        name, ext = os.path.splitext(os.path.basename(path))
+        if moduleName is None:
+            moduleName = name
+        info = (ext, "r", imp.PY_SOURCE)
+        deferredImports = []
+        module = self._LoadModule(moduleName, file(path, "U"), path, info,
+                deferredImports)
+        self._ImportDeferredImports(deferredImports)
+        return module
+
+    def IncludeFiles(self, sourcePath, targetPath):
+        """Include the files in the given directory in the target build."""
+        self.includeFiles.append((sourcePath, targetPath))
+
+    def IncludeModule(self, name):
+        """Include the named module in the frozen executable."""
+        deferredImports = []
+        module = self._ImportModule(name, deferredImports)
+        self._ImportDeferredImports(deferredImports)
+        return module
+
+    def IncludePackage(self, name):
+        """Include the named package and any submodules in the frozen
+           executable."""
+        deferredImports = []
+        module = self._ImportModule(name, deferredImports)
+        if module.path:
+            self._ImportAllSubModules(module, deferredImports)
+        self._ImportDeferredImports(deferredImports)
+        return module
+
+    def ReportMissingModules(self):
+        if self._badModules:
+            print "Missing modules:"
+            names = self._badModules.keys()
+            names.sort()
+            for name in names:
+                callers = self._badModules[name].keys()
+                callers.sort()
+                print "?", name, "imported from", ", ".join(callers)
+            print
+
+
+class Module(object):
+
+    def __init__(self, name):
+        self.name = name
+        self.file = None
+        self.path = None
+        self.code = None
+        self.parent = None
+        self.globalNames = {}
+        self.excludeNames = {}
+        self.ignoreNames = {}
+        self.allNames = []
+        self.inZipFile = False
+
+    def __repr__(self):
+        parts = ["name=%s" % repr(self.name)]
+        if self.file is not None:
+            parts.append("file=%s" % repr(self.file))
+        if self.path is not None:
+            parts.append("path=%s" % repr(self.path))
+        return "<Module %s>" % ", ".join(parts)
+
+    def AddGlobalName(self, name):
+        self.globalNames[name] = None
+
+    def ExcludeName(self, name):
+        self.excludeNames[name] = None
+
+    def IgnoreName(self, name):
+        self.ignoreNames[name] = None
+
diff --git a/installer/cx_Freeze/cx_Freeze/freezer.py b/installer/cx_Freeze/cx_Freeze/freezer.py
new file mode 100644
index 0000000000..e0739e8a4e
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/freezer.py
@@ -0,0 +1,550 @@
+"""
+Base class for freezing scripts into executables.
+"""
+
+import datetime
+import distutils.sysconfig
+import imp
+import marshal
+import os
+import shutil
+import socket
+import stat
+import struct
+import sys
+import time
+import zipfile
+
+import cx_Freeze
+import cx_Freeze.util
+
+__all__ = [ "ConfigError", "ConstantsModule", "Executable", "Freezer" ]
+
+if sys.platform == "win32":
+    pythonDll = "python%s%s.dll" % sys.version_info[:2]
+    GLOBAL_BIN_PATH_EXCLUDES = [cx_Freeze.util.GetSystemDir()]
+    GLOBAL_BIN_INCLUDES = [
+            pythonDll,
+            "gdiplus.dll",
+            "mfc71.dll",
+            "msvcp71.dll",
+            "msvcr71.dll"
+    ]
+    GLOBAL_BIN_EXCLUDES = [
+            "comctl32.dll",
+            "oci.dll",
+            "cx_Logging.pyd"
+    ]
+else:
+    extension = distutils.sysconfig.get_config_var("SO")
+    pythonSharedLib = "libpython%s.%s%s" % \
+            (sys.version_info[:2] + (extension,))
+    GLOBAL_BIN_INCLUDES = [pythonSharedLib]
+    GLOBAL_BIN_EXCLUDES = [
+            "libclntsh.so",
+            "libwtc9.so"
+    ]
+    GLOBAL_BIN_PATH_EXCLUDES = ["/lib", "/lib32", "/lib64", "/usr/lib",
+            "/usr/lib32", "/usr/lib64"]
+
+
+# NOTE: the try: except: block in this code is not necessary under Python 2.4
+# and higher and can be removed once support for Python 2.3 is no longer needed
+EXTENSION_LOADER_SOURCE = \
+"""
+import imp, os, sys
+
+found = False
+for p in sys.path:
+    if not os.path.isdir(p):
+        continue
+    f = os.path.join(p, "%s")
+    if not os.path.exists(f):
+        continue
+    try:
+        m = imp.load_dynamic(__name__, f)
+    except ImportError:
+        del sys.modules[__name__]
+        raise
+    sys.modules[__name__] = m
+    found = True
+    break
+if not found:
+    del sys.modules[__name__]
+    raise ImportError, "No module named %%s" %% __name__
+"""
+
+
+class Freezer(object):
+
+    def __init__(self, executables, constantsModules = [], includes = [],
+            excludes = [], packages = [], replacePaths = [], compress = None,
+            optimizeFlag = 0, copyDependentFiles = None, initScript = None,
+            base = None, path = None, createLibraryZip = None,
+            appendScriptToExe = None, appendScriptToLibrary = None,
+            targetDir = None, binIncludes = [], binExcludes = [],
+            binPathIncludes = [], binPathExcludes = [], icon = None,
+            includeFiles = []):
+        self.executables = executables
+        self.constantsModules = constantsModules
+        self.includes = includes
+        self.excludes = excludes
+        self.packages = packages
+        self.replacePaths = replacePaths
+        self.compress = compress
+        self.optimizeFlag = optimizeFlag
+        self.copyDependentFiles = copyDependentFiles
+        self.initScript = initScript
+        self.base = base
+        self.path = path
+        self.createLibraryZip = createLibraryZip
+        self.appendScriptToExe = appendScriptToExe
+        self.appendScriptToLibrary = appendScriptToLibrary
+        self.targetDir = targetDir
+        self.binIncludes = [os.path.normcase(n) \
+                for n in GLOBAL_BIN_INCLUDES + binIncludes]
+        self.binExcludes = [os.path.normcase(n) \
+                for n in GLOBAL_BIN_EXCLUDES + binExcludes]
+        self.binPathIncludes = [os.path.normcase(n) for n in binPathIncludes]
+        self.binPathExcludes = [os.path.normcase(n) \
+                for n in GLOBAL_BIN_PATH_EXCLUDES + binPathExcludes]
+        self.icon = icon
+        self.includeFiles = includeFiles
+        self._VerifyConfiguration()
+
+    def _CopyFile(self, source, target, copyDependentFiles,
+            includeMode = False):
+        normalizedSource = os.path.normcase(os.path.normpath(source))
+        normalizedTarget = os.path.normcase(os.path.normpath(target))
+        if normalizedTarget in self.filesCopied:
+            return
+        if normalizedSource == normalizedTarget:
+            return
+        self._RemoveFile(target)
+        targetDir = os.path.dirname(target)
+        self._CreateDirectory(targetDir)
+        print "copying", source, "->", target
+        shutil.copyfile(source, target)
+        if includeMode:
+            shutil.copymode(source, target)
+        self.filesCopied[normalizedTarget] = None
+        if copyDependentFiles:
+            for source in self._GetDependentFiles(source):
+                target = os.path.join(targetDir, os.path.basename(source))
+                self._CopyFile(source, target, copyDependentFiles)
+
+    def _CreateDirectory(self, path):
+        if not os.path.isdir(path):
+            print "creating directory", path
+            os.makedirs(path)
+
+    def _FreezeExecutable(self, exe):
+        if self.createLibraryZip:
+            finder = self.finder
+        else:
+            finder = self._GetModuleFinder(exe)
+        if exe.script is None:
+            scriptModule = None
+        else:
+            scriptModule = finder.IncludeFile(exe.script, exe.moduleName)
+        self._CopyFile(exe.base, exe.targetName, exe.copyDependentFiles,
+                includeMode = True)
+        if exe.icon is not None:
+            if sys.platform == "win32":
+                cx_Freeze.util.AddIcon(exe.targetName, exe.icon)
+            else:
+                targetName = os.path.join(os.path.dirname(exe.targetName),
+                        os.path.basename(exe.icon))
+                self._CopyFile(exe.icon, targetName,
+                        copyDependentFiles = False)
+        if not os.access(exe.targetName, os.W_OK):
+            mode = os.stat(exe.targetName).st_mode
+            os.chmod(exe.targetName, mode | stat.S_IWUSR)
+        if not exe.appendScriptToLibrary:
+            if exe.appendScriptToExe:
+                fileName = exe.targetName
+            else:
+                baseFileName, ext = os.path.splitext(exe.targetName)
+                fileName = baseFileName + ".zip"
+                self._RemoveFile(fileName)
+            if not self.createLibraryZip and exe.copyDependentFiles:
+                scriptModule = None
+            self._WriteModules(fileName, exe.initScript, finder, exe.compress,
+                    exe.copyDependentFiles, scriptModule)
+
+    def _GetBaseFileName(self, argsSource = None):
+        if argsSource is None:
+            argsSource = self
+        name = argsSource.base
+        if name is None:
+            if argsSource.copyDependentFiles:
+                name = "Console"
+            else:
+                name = "ConsoleKeepPath"
+        argsSource.base = self._GetFileName("bases", name)
+        if argsSource.base is None:
+            raise ConfigError("no base named %s", name)
+
+    def _GetDependentFiles(self, path):
+        dependentFiles = self.dependentFiles.get(path)
+        if dependentFiles is None:
+            if sys.platform == "win32":
+                origPath = os.environ["PATH"]
+                os.environ["PATH"] = origPath + os.pathsep + \
+                        os.pathsep.join(sys.path)
+                dependentFiles = cx_Freeze.util.GetDependentFiles(path)
+                os.environ["PATH"] = origPath
+            else:
+                dependentFiles = []
+                for line in os.popen('ldd "%s"' % path):
+                    parts = line.strip().split(" => ")
+                    if len(parts) != 2:
+                        continue
+                    dependentFile = parts[1]
+                    if dependentFile == "not found":
+                        print "WARNING: cannot find", parts[0]
+                        continue
+                    pos = dependentFile.find(" (")
+                    if pos >= 0:
+                        dependentFile = dependentFile[:pos].strip()
+                    if dependentFile:
+                        dependentFiles.append(dependentFile)
+            dependentFiles = self.dependentFiles[path] = \
+                    [f for f in dependentFiles if self._ShouldCopyFile(f)]
+        return dependentFiles
+
+    def _GetFileName(self, dir, name):
+        if os.path.isabs(name):
+            return name
+        name = os.path.normcase(name)
+        fullDir = os.path.join(os.path.dirname(cx_Freeze.__file__), dir)
+        if os.path.isdir(fullDir):
+            for fileName in os.listdir(fullDir):
+                if name == os.path.splitext(os.path.normcase(fileName))[0]:
+                    return os.path.join(fullDir, fileName)
+
+    def _GetInitScriptFileName(self, argsSource = None):
+        if argsSource is None:
+            argsSource = self
+        name = argsSource.initScript
+        if name is None:
+            if argsSource.copyDependentFiles:
+                name = "Console"
+            else:
+                name = "ConsoleKeepPath"
+        argsSource.initScript = self._GetFileName("initscripts", name)
+        if argsSource.initScript is None:
+            raise ConfigError("no initscript named %s", name)
+
+    def _GetModuleFinder(self, argsSource = None):
+        if argsSource is None:
+            argsSource = self
+        finder = cx_Freeze.ModuleFinder(self.includeFiles, argsSource.excludes,
+                argsSource.path, argsSource.replacePaths)
+        if argsSource.copyDependentFiles:
+            finder.IncludeModule("imp")
+            finder.IncludeModule("os")
+            finder.IncludeModule("sys")
+            if argsSource.compress:
+                finder.IncludeModule("zlib")
+        for name in argsSource.includes:
+            finder.IncludeModule(name)
+        for name in argsSource.packages:
+            finder.IncludePackage(name)
+        return finder
+
+    def _PrintReport(self, fileName, modules):
+        print "writing zip file", fileName
+        print
+        print "  %-25s %s" % ("Name", "File")
+        print "  %-25s %s" % ("----", "----")
+        for module in modules:
+            if module.path:
+                print "P",
+            else:
+                print "m",
+            print "%-25s" % module.name, module.file or ""
+        print
+
+    def _RemoveFile(self, path):
+        if os.path.exists(path):
+            os.chmod(path, 0777)
+            os.remove(path)
+
+    def _ShouldCopyFile(self, path):
+        dir, name = os.path.split(os.path.normcase(path))
+        parts = name.split(".")
+        tweaked = False
+        while True:
+            if not parts[-1].isdigit():
+                break
+            parts.pop(-1)
+            tweaked = True
+        if tweaked:
+            name = ".".join(parts)
+        if name in self.binIncludes:
+            return True
+        if name in self.binExcludes:
+            return False
+        for path in self.binPathIncludes:
+            if dir.startswith(path):
+                return True
+        for path in self.binPathExcludes:
+            if dir.startswith(path):
+                return False
+        return True
+
+    def _VerifyCanAppendToLibrary(self):
+        if not self.createLibraryZip:
+            raise ConfigError("script cannot be appended to library zip if "
+                    "one is not being created")
+
+    def _VerifyConfiguration(self):
+        if self.compress is None:
+            self.compress = True
+        if self.copyDependentFiles is None:
+            self.copyDependentFiles = True
+        if self.createLibraryZip is None:
+            self.createLibraryZip = True
+        if self.appendScriptToExe is None:
+            self.appendScriptToExe = False
+        if self.appendScriptToLibrary is None:
+            self.appendScriptToLibrary = \
+                    self.createLibraryZip and not self.appendScriptToExe
+        if self.targetDir is None:
+            self.targetDir = os.path.abspath("dist")
+        self._GetInitScriptFileName()
+        self._GetBaseFileName()
+        if self.path is None:
+            self.path = sys.path
+        if self.appendScriptToLibrary:
+            self._VerifyCanAppendToLibrary()
+        for sourceFileName, targetFileName in self.includeFiles:
+            if not os.path.exists(sourceFileName):
+                raise ConfigError("cannot find file/directory named %s",
+                        sourceFileName)
+            if os.path.isabs(targetFileName):
+                raise ConfigError("target file/directory cannot be absolute")
+        for executable in self.executables:
+            executable._VerifyConfiguration(self)
+
+    def _WriteModules(self, fileName, initScript, finder, compress,
+            copyDependentFiles, scriptModule = None):
+        initModule = finder.IncludeFile(initScript, "cx_Freeze__init__")
+        if scriptModule is None:
+            for module in self.constantsModules:
+                module.Create(finder)
+            modules = [m for m in finder.modules \
+                    if m.name not in self.excludeModules]
+        else:
+            modules = [initModule, scriptModule]
+            self.excludeModules[initModule.name] = None
+            self.excludeModules[scriptModule.name] = None
+        itemsToSort = [(m.name, m) for m in modules]
+        itemsToSort.sort()
+        modules = [m for n, m in itemsToSort]
+        self._PrintReport(fileName, modules)
+        if scriptModule is None:
+            finder.ReportMissingModules()
+        targetDir = os.path.dirname(fileName)
+        self._CreateDirectory(targetDir)
+        filesToCopy = []
+        if os.path.exists(fileName):
+            mode = "a"
+        else:
+            mode = "w"
+        outFile = zipfile.PyZipFile(fileName, mode, zipfile.ZIP_DEFLATED)
+        for module in modules:
+            if module.code is None and module.file is not None:
+                fileName = os.path.basename(module.file)
+                baseFileName, ext = os.path.splitext(fileName)
+                if baseFileName != module.name and module.name != "zlib":
+                    if "." in module.name:
+                        fileName = module.name + ext
+                    generatedFileName = "ExtensionLoader_%s.py" % \
+                            module.name.replace(".", "_")
+                    module.code = compile(EXTENSION_LOADER_SOURCE % fileName,
+                            generatedFileName, "exec")
+                target = os.path.join(targetDir, fileName)
+                filesToCopy.append((module, target))
+            if module.code is None:
+                continue
+            fileName = "/".join(module.name.split("."))
+            if module.path:
+                fileName += "/__init__"
+            if module.file is not None and os.path.exists(module.file):
+                mtime = os.stat(module.file).st_mtime
+            else:
+                mtime = time.time()
+            zipTime = time.localtime(mtime)[:6]
+            data = imp.get_magic() + struct.pack("<i", mtime) + \
+                    marshal.dumps(module.code)
+            zinfo = zipfile.ZipInfo(fileName + ".pyc", zipTime)
+            if compress:
+                zinfo.compress_type = zipfile.ZIP_DEFLATED
+            outFile.writestr(zinfo, data)
+        origPath = os.environ["PATH"]
+        for module, target in filesToCopy:
+            try:
+                if module.parent is not None:
+                    path = os.pathsep.join([origPath] + module.parent.path)
+                    os.environ["PATH"] = path
+                self._CopyFile(module.file, target, copyDependentFiles)
+            finally:
+                os.environ["PATH"] = origPath
+
+    def Freeze(self):
+        self.finder = None
+        self.excludeModules = {}
+        self.dependentFiles = {}
+        self.filesCopied = {}
+        cx_Freeze.util.SetOptimizeFlag(self.optimizeFlag)
+        if self.createLibraryZip:
+            self.finder = self._GetModuleFinder()
+        for executable in self.executables:
+            self._FreezeExecutable(executable)
+        if self.createLibraryZip:
+            fileName = os.path.join(self.targetDir, "library.zip")
+            self._RemoveFile(fileName)
+            self._WriteModules(fileName, self.initScript, self.finder,
+                    self.compress, self.copyDependentFiles)
+        for sourceFileName, targetFileName in self.includeFiles:
+            fullName = os.path.join(self.targetDir, targetFileName)
+            if os.path.isdir(sourceFileName):
+                for path, dirNames, fileNames in os.walk(sourceFileName):
+                    shortPath = path[len(sourceFileName) + 1:]
+                    if ".svn" in dirNames:
+                        dirNames.remove(".svn")
+                    if "CVS" in dirNames:
+                        dirNames.remove("CVS")
+                    for fileName in fileNames:
+                        fullSourceName = os.path.join(path, fileName)
+                        fullTargetName = os.path.join(self.targetDir,
+                                targetFileName, shortPath, fileName)
+                        self._CopyFile(fullSourceName, fullTargetName,
+                                copyDependentFiles = False)
+            else:
+                self._CopyFile(sourceFileName, fullName,
+                        copyDependentFiles = False)
+
+
+class ConfigError(Exception):
+
+    def __init__(self, format, *args):
+        self.what = format % args
+
+    def __str__(self):
+        return self.what
+
+
+class Executable(object):
+
+    def __init__(self, script, initScript = None, base = None, path = None,
+            targetDir = None, targetName = None, includes = None,
+            excludes = None, packages = None, replacePaths = None,
+            compress = None, copyDependentFiles = None,
+            appendScriptToExe = None, appendScriptToLibrary = None,
+            icon = None):
+        self.script = script
+        self.initScript = initScript
+        self.base = base
+        self.path = path
+        self.targetDir = targetDir
+        self.targetName = targetName
+        self.includes = includes
+        self.excludes = excludes
+        self.packages = packages
+        self.replacePaths = replacePaths
+        self.compress = compress
+        self.copyDependentFiles = copyDependentFiles
+        self.appendScriptToExe = appendScriptToExe
+        self.appendScriptToLibrary = appendScriptToLibrary
+        self.icon = icon
+
+    def __repr__(self):
+        return "<Executable script=%s>" % self.script
+
+    def _VerifyConfiguration(self, freezer):
+        if self.path is None:
+            self.path = freezer.path
+        if self.targetDir is None:
+            self.targetDir = freezer.targetDir
+        if self.includes is None:
+            self.includes = freezer.includes
+        if self.excludes is None:
+            self.excludes = freezer.excludes
+        if self.packages is None:
+            self.packages = freezer.packages
+        if self.replacePaths is None:
+            self.replacePaths = freezer.replacePaths
+        if self.compress is None:
+            self.compress = freezer.compress
+        if self.copyDependentFiles is None:
+            self.copyDependentFiles = freezer.copyDependentFiles
+        if self.appendScriptToExe is None:
+            self.appendScriptToExe = freezer.appendScriptToExe
+        if self.appendScriptToLibrary is None:
+            self.appendScriptToLibrary = freezer.appendScriptToLibrary
+        if self.initScript is None:
+            self.initScript = freezer.initScript
+        else:
+            freezer._GetInitScriptFileName(self)
+        if self.base is None:
+            self.base = freezer.base
+        else:
+            freezer._GetBaseFileName(self)
+        if self.appendScriptToLibrary:
+            freezer._VerifyCanAppendToLibrary()
+        if self.icon is None:
+            self.icon = freezer.icon
+        if self.script is not None:
+            name, ext = os.path.splitext(os.path.basename(self.script))
+            if self.appendScriptToLibrary:
+                self.moduleName = "%s__main__" % os.path.normcase(name)
+            else:
+                self.moduleName = "__main__"
+        if self.targetName is None:
+            baseName, ext = os.path.splitext(self.base)
+            self.targetName = name + ext
+        self.targetName = os.path.join(self.targetDir, self.targetName)
+
+
+class ConstantsModule(object):
+
+    def __init__(self, releaseString = None, copyright = None,
+            moduleName = "BUILD_CONSTANTS", timeFormat = "%B %d, %Y %H:%M:%S"):
+        self.moduleName = moduleName
+        self.timeFormat = timeFormat
+        self.values = {}
+        self.values["BUILD_RELEASE_STRING"] = releaseString
+        self.values["BUILD_COPYRIGHT"] = copyright
+
+    def Create(self, finder):
+        """Create the module which consists of declaration statements for each
+           of the values."""
+        today = datetime.datetime.today()
+        sourceTimestamp = 0
+        for module in finder.modules:
+            if module.file is None:
+                continue
+            if module.inZipFile:
+                continue
+            if not os.path.exists(module.file):
+                raise ConfigError("no file named %s", module.file)
+            timestamp = os.stat(module.file).st_mtime
+            sourceTimestamp = max(sourceTimestamp, timestamp)
+        sourceTimestamp = datetime.datetime.fromtimestamp(sourceTimestamp)
+        self.values["BUILD_TIMESTAMP"] = today.strftime(self.timeFormat)
+        self.values["BUILD_HOST"] = socket.gethostname().split(".")[0]
+        self.values["SOURCE_TIMESTAMP"] = \
+                sourceTimestamp.strftime(self.timeFormat)
+        module = finder._AddModule(self.moduleName)
+        sourceParts = []
+        names = self.values.keys()
+        names.sort()
+        for name in names:
+            value = self.values[name]
+            sourceParts.append("%s = %r" % (name, value))
+        source = "\n".join(sourceParts)
+        module.code = compile(source, "%s.py" % self.moduleName, "exec")
+
diff --git a/installer/cx_Freeze/cx_Freeze/hooks.py b/installer/cx_Freeze/cx_Freeze/hooks.py
new file mode 100644
index 0000000000..edc2f78788
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/hooks.py
@@ -0,0 +1,281 @@
+import os
+import sys
+
+def initialize(finder):
+    """upon initialization of the finder, this routine is called to set up some
+       automatic exclusions for various platforms."""
+    finder.ExcludeModule("FCNTL")
+    finder.ExcludeModule("os.path")
+    if os.name == "nt":
+        finder.ExcludeModule("fcntl")
+        finder.ExcludeModule("grp")
+        finder.ExcludeModule("pwd")
+        finder.ExcludeModule("termios")
+    else:
+        finder.ExcludeModule("_winreg")
+        finder.ExcludeModule("msilib")
+        finder.ExcludeModule("msvcrt")
+        finder.ExcludeModule("nt")
+        if os.name not in ("os2", "ce"):
+            finder.ExcludeModule("ntpath")
+        finder.ExcludeModule("nturl2path")
+        finder.ExcludeModule("pythoncom")
+        finder.ExcludeModule("pywintypes")
+        finder.ExcludeModule("winerror")
+        finder.ExcludeModule("winsound")
+        finder.ExcludeModule("win32api")
+        finder.ExcludeModule("win32con")
+        finder.ExcludeModule("win32event")
+        finder.ExcludeModule("win32file")
+        finder.ExcludeModule("win32pdh")
+        finder.ExcludeModule("win32pipe")
+        finder.ExcludeModule("win32process")
+        finder.ExcludeModule("win32security")
+        finder.ExcludeModule("win32service")
+        finder.ExcludeModule("wx.activex")
+    if os.name != "posix":
+        finder.ExcludeModule("posix")
+    if os.name != "mac":
+        finder.ExcludeModule("Carbon")
+        finder.ExcludeModule("gestalt")
+        finder.ExcludeModule("ic")
+        finder.ExcludeModule("mac")
+        finder.ExcludeModule("MacOS")
+        finder.ExcludeModule("macpath")
+        finder.ExcludeModule("macurl2path")
+        if os.name != "nt":
+            finder.ExcludeModule("EasyDialogs")
+    if os.name != "os2":
+        finder.ExcludeModule("os2")
+        finder.ExcludeModule("os2emxpath")
+        finder.ExcludeModule("_emx_link")
+    if os.name != "ce":
+        finder.ExcludeModule("ce")
+    if os.name != "riscos":
+        finder.ExcludeModule("riscos")
+        finder.ExcludeModule("riscosenviron")
+        finder.ExcludeModule("riscospath")
+        finder.ExcludeModule("rourl2path")
+    if sys.platform[:4] != "java":
+        finder.ExcludeModule("java.lang")
+        finder.ExcludeModule("org.python.core")
+
+
+def load_cElementTree(finder, module):
+    """the cElementTree module implicitly loads the elementtree.ElementTree
+       module; make sure this happens."""
+    finder.IncludeModule("elementtree.ElementTree")
+
+
+def load_ceODBC(finder, module):
+    """the ceODBC module implicitly imports both datetime and decimal; make
+       sure this happens."""
+    finder.IncludeModule("datetime")
+    finder.IncludeModule("decimal")
+
+
+def load_cx_Oracle(finder, module):
+    """the cx_Oracle module implicitly imports datetime; make sure this
+       happens."""
+    finder.IncludeModule("datetime")
+
+
+def load_docutils_frontend(finder, module):
+    """The optik module is the old name for the optparse module; ignore the
+       module if it cannot be found."""
+    module.IgnoreName("optik")
+
+
+def load_dummy_threading(finder, module):
+    """the dummy_threading module plays games with the name of the threading
+       module for its own purposes; ignore that here"""
+    finder.ExcludeModule("_dummy_threading")
+
+
+def load_email(finder, module):
+    """the email package has a bunch of aliases as the submodule names were
+       all changed to lowercase in Python 2.5; mimic that here."""
+    if sys.version_info[:2] >= (2, 5):
+        for name in ("Charset", "Encoders", "Errors", "FeedParser",
+                "Generator", "Header", "Iterators", "Message", "Parser",
+                "Utils", "base64MIME", "quopriMIME"):
+            finder.AddAlias("email.%s" % name, "email.%s" % name.lower())
+
+
+def load_ftplib(finder, module):
+    """the ftplib module attempts to import the SOCKS module; ignore this
+       module if it cannot be found"""
+    module.IgnoreName("SOCKS")
+
+
+def load_matplotlib(finder, module):
+    """the matplotlib module requires data to be found in mpl-data in the
+       same directory as the frozen executable so oblige it"""
+    dir = os.path.join(module.path[0], "mpl-data")
+    finder.IncludeFiles(dir, "mpl-data")
+
+
+def load_matplotlib_numerix(finder, module):
+    """the numpy.numerix module loads a number of modules dynamically"""
+    for name in ("ma", "fft", "linear_algebra", "random_array", "mlab"):
+        finder.IncludeModule("%s.%s" % (module.name, name))
+
+
+def load_numpy_linalg(finder, module):
+    """the numpy.linalg module implicitly loads the lapack_lite module; make
+       sure this happens"""
+    finder.IncludeModule("numpy.linalg.lapack_lite")
+
+
+def load_pty(finder, module):
+    """The sgi module is not needed for this module to function."""
+    module.IgnoreName("sgi")
+
+
+def load_pythoncom(finder, module):
+    """the pythoncom module is actually contained in a DLL but since those
+       cannot be loaded directly in Python 2.5 and higher a special module is
+       used to perform that task; simply use that technique directly to
+       determine the name of the DLL and ensure it is included as a normal
+       extension; also load the pywintypes module which is implicitly
+       loaded."""
+    import pythoncom
+    module.file = pythoncom.__file__
+    module.code = None
+    finder.IncludeModule("pywintypes")
+
+
+def load_pywintypes(finder, module):
+    """the pywintypes module is actually contained in a DLL but since those
+       cannot be loaded directly in Python 2.5 and higher a special module is
+       used to perform that task; simply use that technique directly to
+       determine the name of the DLL and ensure it is included as a normal
+       extension."""
+    import pywintypes
+    module.file = pywintypes.__file__
+    module.code = None
+
+
+def load_PyQt4_Qt(finder, module):
+    """the PyQt4.Qt module is an extension module which imports a number of
+       other modules and injects their namespace into its own. It seems a
+       foolish way of doing things but perhaps there is some hidden advantage
+       to this technique over pure Python; ignore the absence of some of
+       the modules since not every installation includes all of them."""
+    finder.IncludeModule("PyQt4.QtCore")
+    finder.IncludeModule("PyQt4.QtGui")
+    finder.IncludeModule("sip")
+    for name in ("PyQt4.QtSvg", "PyQt4.Qsci", "PyQt4.QtAssistant",
+            "PyQt4.QtNetwork", "PyQt4.QtOpenGL", "PyQt4.QtScript", "PyQt4._qt",
+            "PyQt4.QtSql", "PyQt4.QtSvg", "PyQt4.QtTest", "PyQt4.QtXml"):
+        try:
+            finder.IncludeModule(name)
+        except ImportError:
+            pass
+
+
+def load_Tkinter(finder, module):
+    """the Tkinter module has data files that are required to be loaded so
+       ensure that they are copied into the directory that is expected at
+       runtime."""
+    import Tkinter
+    import _tkinter
+    tk = _tkinter.create()
+    tclDir = os.path.dirname(tk.call("info", "library"))
+    tclSourceDir = os.path.join(tclDir, "tcl%s" % _tkinter.TCL_VERSION)
+    tkSourceDir = os.path.join(tclDir, "tk%s" % _tkinter.TK_VERSION)
+    finder.IncludeFiles(tclSourceDir, "tcl")
+    finder.IncludeFiles(tkSourceDir, "tk")
+
+
+def load_tempfile(finder, module):
+    """the tempfile module attempts to load the fcntl and thread modules but
+       continues if these modules cannot be found; ignore these modules if they
+       cannot be found."""
+    module.IgnoreName("fcntl")
+    module.IgnoreName("thread")
+
+
+def load_time(finder, module):
+    """the time module implicitly loads _strptime; make sure this happens."""
+    finder.IncludeModule("_strptime")
+
+
+def load_win32api(finder, module):
+    """the win32api module implicitly loads the pywintypes module; make sure
+       this happens."""
+    finder.IncludeModule("pywintypes")
+
+
+def load_win32com(finder, module):
+    """the win32com package manipulates its search path at runtime to include
+       the sibling directory called win32comext; simulate that by changing the
+       search path in a similar fashion here."""
+    baseDir = os.path.dirname(os.path.dirname(module.file))
+    module.path.append(os.path.join(baseDir, "win32comext"))
+
+
+def load_win32file(finder, module):
+    """the win32api module implicitly loads the pywintypes module; make sure
+       this happens."""
+    finder.IncludeModule("pywintypes")
+
+
+def load_xml(finder, module):
+    """the builtin xml package attempts to load the _xmlplus module to see if
+       that module should take its role instead; ignore the failure to find
+       this module, though."""
+    module.IgnoreName("_xmlplus")
+
+
+def load_xml_etree_cElementTree(finder, module):
+    """the xml.etree.cElementTree module implicitly loads the
+       xml.etree.ElementTree module; make sure this happens."""
+    finder.IncludeModule("xml.etree.ElementTree")
+
+def load_IPython(finder, module):
+    ipy = os.path.join(os.path.dirname(module.file), 'Extensions')
+    extensions = set([])
+    for m in os.listdir(ipy):
+        extensions.add(os.path.splitext(m)[0])
+    extensions.remove('__init__')
+    for m in extensions:
+        finder.IncludeModule('IPython.Extensions.'+m)
+        
+def load_lxml(finder, module):
+    finder.IncludeModule('lxml._elementpath')
+    
+def load_cherrypy(finder, module):
+    finder.IncludeModule('cherrypy.lib.encoding')
+
+def missing_cElementTree(finder, caller):
+    """the cElementTree has been incorporated into the standard library in
+       Python 2.5 so ignore its absence if it cannot found."""
+    if sys.version_info[:2] >= (2, 5):
+        caller.IgnoreName("cElementTree")
+
+
+def missing_EasyDialogs(finder, caller):
+    """the EasyDialogs module is not normally present on Windows but it also
+       may be so instead of excluding it completely, ignore it if it can't be
+       found"""
+    if sys.platform == "win32":
+        caller.IgnoreName("EasyDialogs")
+
+
+def missing_readline(finder, caller):
+    """the readline module is not normally present on Windows but it also may
+       be so instead of excluding it completely, ignore it if it can't be
+       found"""
+    if sys.platform == "win32":
+        caller.IgnoreName("readline")
+
+
+def missing_xml_etree(finder, caller):
+    """the xml.etree package is new for Python 2.5 but it is common practice
+       to use a try..except.. block in order to support versions earlier than
+       Python 2.5 transparently; ignore the absence of the package in this
+       situation."""
+    if sys.version_info[:2] < (2, 5):
+        caller.IgnoreName("xml.etree")
+
diff --git a/installer/cx_Freeze/cx_Freeze/main.py b/installer/cx_Freeze/cx_Freeze/main.py
new file mode 100644
index 0000000000..1704c598d2
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/main.py
@@ -0,0 +1,171 @@
+import optparse
+import os
+import shutil
+import stat
+import sys
+
+import cx_Freeze
+
+__all__ = ["main"]
+
+USAGE = \
+"""
+%prog [options] [SCRIPT]
+
+Freeze a Python script and all of its referenced modules to a base
+executable which can then be distributed without requiring a Python
+installation."""
+
+VERSION = \
+"""
+%%prog %s
+Copyright (c) 2007-2008 Colt Engineering. All rights reserved.
+Copyright (c) 2001-2006 Computronix Corporation. All rights reserved.""" % \
+        cx_Freeze.version
+
+
+def ParseCommandLine():
+    parser = optparse.OptionParser(version = VERSION.strip(),
+            usage = USAGE.strip())
+    parser.add_option("-O",
+            action = "count",
+            default = 0,
+            dest = "optimized",
+            help = "optimize generated bytecode as per PYTHONOPTIMIZE; "
+                   "use -OO in order to remove doc strings")
+    parser.add_option("-c", "--compress",
+            action = "store_true",
+            dest = "compress",
+            help = "compress byte code in zip files")
+    parser.add_option("--base-name",
+            dest = "baseName",
+            metavar = "NAME",
+            help = "file on which to base the target file; if the name of the "
+                   "file is not an absolute file name, the subdirectory bases "
+                   "(rooted in the directory in which the freezer is found) "
+                   "will be searched for a file matching the name")
+    parser.add_option("--init-script",
+            dest = "initScript",
+            metavar = "NAME",
+            help = "script which will be executed upon startup; if the name "
+                   "of the file is not an absolute file name, the "
+                   "subdirectory initscripts (rooted in the directory in "
+                   "which the cx_Freeze package is found) will be searched "
+                   "for a file matching the name")
+    parser.add_option("--target-dir", "--install-dir",
+            dest = "targetDir",
+            metavar = "DIR",
+            help = "the directory in which to place the target file and "
+                   "any dependent files")
+    parser.add_option("--target-name",
+            dest = "targetName",
+            metavar = "NAME",
+            help = "the name of the file to create instead of the base name "
+                   "of the script and the extension of the base binary")
+    parser.add_option("--no-copy-deps",
+            dest = "copyDeps",
+            default = True,
+            action = "store_false",
+            help = "do not copy the dependent files (extensions, shared "
+                   "libraries, etc.) to the target directory; this also "
+                   "modifies the default init script to ConsoleKeepPath.py "
+                   "and means that the target executable requires a Python "
+                   "installation to execute properly")
+    parser.add_option("--default-path",
+            action = "append",
+            dest = "defaultPath",
+            metavar = "DIRS",
+            help = "list of paths separated by the standard path separator "
+                   "for the platform which will be used to initialize "
+                   "sys.path prior to running the module finder")
+    parser.add_option("--include-path",
+            action = "append",
+            dest = "includePath",
+            metavar = "DIRS",
+            help = "list of paths separated by the standard path separator "
+                   "for the platform which will be used to modify sys.path "
+                   "prior to running the module finder")
+    parser.add_option("--replace-paths",
+            dest = "replacePaths",
+            metavar = "DIRECTIVES",
+            help = "replace all the paths in modules found in the given paths "
+                   "with the given replacement string; multiple values are "
+                   "separated by the standard path separator and each value "
+                   "is of the form path=replacement_string; path can be * "
+                   "which means all paths not already specified")
+    parser.add_option("--include-modules",
+            dest = "includeModules",
+            metavar = "NAMES",
+            help = "comma separated list of modules to include")
+    parser.add_option("--exclude-modules",
+            dest = "excludeModules",
+            metavar = "NAMES",
+            help = "comma separated list of modules to exclude")
+    parser.add_option("--ext-list-file",
+            dest = "extListFile",
+            metavar = "NAME",
+            help = "name of file in which to place the list of dependent files "
+                   "which were copied into the target directory")
+    parser.add_option("-z", "--zip-include",
+            dest = "zipIncludes",
+            action = "append",
+            default = [],
+            metavar = "SPEC",
+            help = "name of file to add to the zip file or a specification of "
+                   "the form name=arcname which will specify the archive name "
+                   "to use; multiple --zip-include arguments can be used")
+    options, args = parser.parse_args()
+    if len(args) == 0:
+        options.script = None
+    elif len(args) == 1:
+        options.script, = args
+    else:
+        parser.error("only one script can be specified")
+    if not args and options.includeModules is None and options.copyDeps:
+        parser.error("script or a list of modules must be specified")
+    if not args and options.targetName is None:
+        parser.error("script or a target name must be specified")
+    if options.excludeModules:
+        options.excludeModules = options.excludeModules.split(",")
+    else:
+        options.excludeModules = []
+    if options.includeModules:
+        options.includeModules = options.includeModules.split(",")
+    else:
+        options.includeModules = []
+    replacePaths = []
+    if options.replacePaths:
+        for directive in options.replacePaths.split(os.pathsep):
+            fromPath, replacement = directive.split("=")
+            replacePaths.append((fromPath, replacement))
+    options.replacePaths = replacePaths
+    if options.defaultPath is not None:
+        sys.path = [p for mp in options.defaultPath \
+                for p in mp.split(os.pathsep)]
+    if options.includePath is not None:
+        paths = [p for mp in options.includePath for p in mp.split(os.pathsep)]
+        sys.path = paths + sys.path
+    if options.script is not None:
+        sys.path.insert(0, os.path.dirname(options.script))
+    return options
+
+
+def main():
+    options = ParseCommandLine()
+    executables = [cx_Freeze.Executable(options.script,
+            targetName = options.targetName)]
+    freezer = cx_Freeze.Freezer(executables,
+            includes = options.includeModules,
+            excludes = options.excludeModules,
+            replacePaths = options.replacePaths,
+            compress = options.compress,
+            optimizeFlag = options.optimized,
+            copyDependentFiles = options.copyDeps,
+            initScript = options.initScript,
+            base = options.baseName,
+            path = None,
+            createLibraryZip = False,
+            appendScriptToExe = True,
+            targetDir = options.targetDir)
+    freezer.Freeze()
+
diff --git a/installer/cx_Freeze/cx_Freeze/windist.py b/installer/cx_Freeze/cx_Freeze/windist.py
new file mode 100644
index 0000000000..51af544771
--- /dev/null
+++ b/installer/cx_Freeze/cx_Freeze/windist.py
@@ -0,0 +1,337 @@
+import distutils.command.bdist_msi
+import msilib
+import os
+
+__all__ = [ "bdist_msi" ]
+
+# force the remove existing products action to happen first since Windows
+# installer appears to be braindead and doesn't handle files shared between
+# different "products" very well
+sequence = msilib.sequence.InstallExecuteSequence
+for index, info in enumerate(sequence):
+    if info[0] == u'RemoveExistingProducts':
+        sequence[index] = (info[0], info[1], 1450)
+
+
+class bdist_msi(distutils.command.bdist_msi.bdist_msi):
+    user_options = distutils.command.bdist_msi.bdist_msi.user_options + [
+        ('add-to-path=', None, 'add target dir to PATH environment variable'),
+        ('upgrade-code=', None, 'upgrade code to use')
+    ]
+    x = y = 50
+    width = 370
+    height = 300
+    title = "[ProductName] Setup"
+    modeless = 1
+    modal = 3
+
+    def add_config(self, fullname):
+        initialTargetDir = self.get_initial_target_dir(fullname)
+        if self.add_to_path is None:
+            self.add_to_path = False
+            for executable in self.distribution.executables:
+                if os.path.basename(executable.base).startswith("Console"):
+                    self.add_to_path = True
+                    break
+        if self.add_to_path:
+            msilib.add_data(self.db, 'Environment',
+                    [("E_PATH", "Path", r"[~];[TARGETDIR]", "TARGETDIR")])
+        msilib.add_data(self.db, 'CustomAction',
+                [("InitialTargetDir", 256 + 51, "TARGETDIR", initialTargetDir)
+                ])
+        msilib.add_data(self.db, 'InstallExecuteSequence',
+                [("InitialTargetDir", 'TARGETDIR=""', 401)])
+        msilib.add_data(self.db, 'InstallUISequence',
+                [("PrepareDlg", None, 140),
+                 ("InitialTargetDir", 'TARGETDIR=""', 401),
+                 ("SelectDirectoryDlg", "not Installed", 1230),
+                 ("MaintenanceTypeDlg",
+                        "Installed and not Resume and not Preselected", 1250),
+                 ("ProgressDlg", None, 1280)
+                ])
+
+    def add_cancel_dialog(self):
+        dialog = msilib.Dialog(self.db, "CancelDlg", 50, 10, 260, 85, 3,
+                self.title, "No", "No", "No")
+        dialog.text("Text", 48, 15, 194, 30, 3,
+                "Are you sure you want to cancel [ProductName] installation?")
+        button = dialog.pushbutton("Yes", 72, 57, 56, 17, 3, "Yes", "No")
+        button.event("EndDialog", "Exit")
+        button = dialog.pushbutton("No", 132, 57, 56, 17, 3, "No", "Yes")
+        button.event("EndDialog", "Return")
+
+    def add_error_dialog(self):
+        dialog = msilib.Dialog(self.db, "ErrorDlg", 50, 10, 330, 101, 65543,
+                self.title, "ErrorText", None, None)
+        dialog.text("ErrorText", 50, 9, 280, 48, 3, "")
+        for text, x in [("No", 120), ("Yes", 240), ("Abort", 0),
+                ("Cancel", 42), ("Ignore", 81), ("Ok", 159), ("Retry", 198)]:
+            button = dialog.pushbutton(text[0], x, 72, 81, 21, 3, text, None)
+            button.event("EndDialog", "Error%s" % text)
+
+    def add_exit_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "ExitDialog",
+                self.x, self.y, self.width, self.height, self.modal,
+                self.title, "Finish", "Finish", "Finish")
+        dialog.title("Completing the [ProductName] installer")
+        dialog.back("< Back", "Finish", active = False)
+        dialog.cancel("Cancel", "Back", active = False)
+        dialog.text("Description", 15, 235, 320, 20, 0x30003,
+                "Click the Finish button to exit the installer.")
+        button = dialog.next("Finish", "Cancel", name = "Finish")
+        button.event("EndDialog", "Return")
+
+    def add_fatal_error_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "FatalError",
+                self.x, self.y, self.width, self.height, self.modal,
+                self.title, "Finish", "Finish", "Finish")
+        dialog.title("[ProductName] installer ended prematurely")
+        dialog.back("< Back", "Finish", active = False)
+        dialog.cancel("Cancel", "Back", active = False)
+        dialog.text("Description1", 15, 70, 320, 80, 0x30003,
+                "[ProductName] setup ended prematurely because of an error. "
+                "Your system has not been modified. To install this program "
+                "at a later time, please run the installation again.")
+        dialog.text("Description2", 15, 155, 320, 20, 0x30003,
+                "Click the Finish button to exit the installer.")
+        button = dialog.next("Finish", "Cancel", name = "Finish")
+        button.event("EndDialog", "Exit")
+
+    def add_files_in_use_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "FilesInUse",
+                self.x, self.y, self.width, self.height, 19, self.title,
+                "Retry", "Retry", "Retry", bitmap = False)
+        dialog.text("Title", 15, 6, 200, 15, 0x30003,
+                r"{\DlgFontBold8}Files in Use")
+        dialog.text("Description", 20, 23, 280, 20, 0x30003,
+                "Some files that need to be updated are currently in use.")
+        dialog.text("Text", 20, 55, 330, 50, 3,
+                "The following applications are using files that need to be "
+                "updated by this setup. Close these applications and then "
+                "click Retry to continue the installation or Cancel to exit "
+                "it.")
+        dialog.control("List", "ListBox", 20, 107, 330, 130, 7,
+                "FileInUseProcess", None, None, None)
+        button = dialog.back("Exit", "Ignore", name = "Exit")
+        button.event("EndDialog", "Exit")
+        button = dialog.next("Ignore", "Retry", name = "Ignore")
+        button.event("EndDialog", "Ignore")
+        button = dialog.cancel("Retry", "Exit", name = "Retry")
+        button.event("EndDialog", "Retry")
+
+    def add_maintenance_type_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db,
+                "MaintenanceTypeDlg", self.x, self.y, self.width, self.height,
+                self.modal, self.title, "Next", "Next", "Cancel")
+        dialog.title("Welcome to the [ProductName] Setup Wizard")
+        dialog.text("BodyText", 15, 63, 330, 42, 3,
+                "Select whether you want to repair or remove [ProductName].")
+        group = dialog.radiogroup("RepairRadioGroup", 15, 108, 330, 60, 3,
+                "MaintenanceForm_Action", "", "Next")
+        group.add("Repair", 0, 18, 300, 17, "&Repair [ProductName]")
+        group.add("Remove", 0, 36, 300, 17, "Re&move [ProductName]")
+        dialog.back("< Back", None, active = False)
+        button = dialog.next("Finish", "Cancel")
+        button.event("[REINSTALL]", "ALL",
+                'MaintenanceForm_Action="Repair"', 5)
+        button.event("[Progress1]", "Repairing",
+                'MaintenanceForm_Action="Repair"', 6)
+        button.event("[Progress2]", "repairs",
+                'MaintenanceForm_Action="Repair"', 7)
+        button.event("Reinstall", "ALL",
+                'MaintenanceForm_Action="Repair"', 8)
+        button.event("[REMOVE]", "ALL",
+                'MaintenanceForm_Action="Remove"', 11)
+        button.event("[Progress1]", "Removing",
+                'MaintenanceForm_Action="Remove"', 12)
+        button.event("[Progress2]", "removes",
+                'MaintenanceForm_Action="Remove"', 13)
+        button.event("Remove", "ALL",
+                'MaintenanceForm_Action="Remove"', 14)
+        button.event("EndDialog", "Return",
+                'MaintenanceForm_Action<>"Change"', 20)
+        button = dialog.cancel("Cancel", "RepairRadioGroup")
+        button.event("SpawnDialog", "CancelDlg")
+
+    def add_prepare_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "PrepareDlg",
+                self.x, self.y, self.width, self.height, self.modeless,
+                self.title, "Cancel", "Cancel", "Cancel")
+        dialog.text("Description", 15, 70, 320, 40, 0x30003,
+                "Please wait while the installer prepares to guide you through"
+                "the installation.")
+        dialog.title("Welcome to the [ProductName] installer")
+        text = dialog.text("ActionText", 15, 110, 320, 20, 0x30003,
+                "Pondering...")
+        text.mapping("ActionText", "Text")
+        text = dialog.text("ActionData", 15, 135, 320, 30, 0x30003, None)
+        text.mapping("ActionData", "Text")
+        dialog.back("Back", None, active = False)
+        dialog.next("Next", None, active = False)
+        button = dialog.cancel("Cancel", None)
+        button.event("SpawnDialog", "CancelDlg")
+
+    def add_progress_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "ProgressDlg",
+                self.x, self.y, self.width, self.height, self.modeless,
+                self.title, "Cancel", "Cancel", "Cancel", bitmap = False)
+        dialog.text("Title", 20, 15, 200, 15, 0x30003,
+                r"{\DlgFontBold8}[Progress1] [ProductName]")
+        dialog.text("Text", 35, 65, 300, 30, 3,
+                "Please wait while the installer [Progress2] [ProductName].")
+        dialog.text("StatusLabel", 35, 100 ,35, 20, 3, "Status:")
+        text = dialog.text("ActionText", 70, 100, self.width - 70, 20, 3,
+                "Pondering...")
+        text.mapping("ActionText", "Text")
+        control = dialog.control("ProgressBar", "ProgressBar", 35, 120, 300,
+                10, 65537, None, "Progress done", None, None)
+        control.mapping("SetProgress", "Progress")
+        dialog.back("< Back", "Next", active = False)
+        dialog.next("Next >", "Cancel", active = False)
+        button = dialog.cancel("Cancel", "Back")
+        button.event("SpawnDialog", "CancelDlg")
+
+    def add_properties(self):
+        metadata = self.distribution.metadata
+        props = [
+                ('DistVersion', metadata.get_version()),
+                ('DefaultUIFont', 'DlgFont8'),
+                ('ErrorDialog', 'ErrorDlg'),
+                ('Progress1', 'Install'),
+                ('Progress2', 'installs'),
+                ('MaintenanceForm_Action', 'Repair')
+        ]
+        email = metadata.author_email or metadata.maintainer_email
+        if email:
+            props.append(("ARPCONTACT", email))
+        if metadata.url:
+            props.append(("ARPURLINFOABOUT", metadata.url))
+        if self.upgrade_code is not None:
+            props.append(("UpgradeCode", self.upgrade_code))
+        msilib.add_data(self.db, 'Property', props)
+
+    def add_select_directory_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db,
+                "SelectDirectoryDlg", self.x, self.y, self.width, self.height,
+                self.modal, self.title, "Next", "Next", "Cancel")
+        dialog.title("Select destination directory")
+        dialog.back("< Back", None, active = False)
+        button = dialog.next("Next >", "Cancel")
+        button.event("SetTargetPath", "TARGETDIR", ordering = 1)
+        button.event("SpawnWaitDialog", "WaitForCostingDlg", ordering = 2)
+        button.event("EndDialog", "Return", ordering = 3)
+        button = dialog.cancel("Cancel", "DirectoryCombo")
+        button.event("SpawnDialog", "CancelDlg")
+        dialog.control("DirectoryCombo", "DirectoryCombo", 15, 70, 272, 80,
+                393219, "TARGETDIR", None, "DirectoryList", None)
+        dialog.control("DirectoryList", "DirectoryList", 15, 90, 308, 136, 3,
+                "TARGETDIR", None, "PathEdit", None)
+        dialog.control("PathEdit", "PathEdit", 15, 230, 306, 16, 3,
+                "TARGETDIR", None, "Next", None)
+        button = dialog.pushbutton("Up", 306, 70, 18, 18, 3, "Up", None)
+        button.event("DirectoryListUp", "0")
+        button = dialog.pushbutton("NewDir", 324, 70, 30, 18, 3, "New", None)
+        button.event("DirectoryListNew", "0")
+
+    def add_text_styles(self):
+        msilib.add_data(self.db, 'TextStyle',
+                [("DlgFont8", "Tahoma", 9, None, 0),
+                 ("DlgFontBold8", "Tahoma", 8, None, 1),
+                 ("VerdanaBold10", "Verdana", 10, None, 1),
+                 ("VerdanaRed9", "Verdana", 9, 255, 0)
+                ])
+
+    def add_ui(self):
+        self.add_text_styles()
+        self.add_error_dialog()
+        self.add_fatal_error_dialog()
+        self.add_cancel_dialog()
+        self.add_exit_dialog()
+        self.add_user_exit_dialog()
+        self.add_files_in_use_dialog()
+        self.add_wait_for_costing_dialog()
+        self.add_prepare_dialog()
+        self.add_select_directory_dialog()
+        self.add_progress_dialog()
+        self.add_maintenance_type_dialog()
+
+    def add_upgrade_config(self, sversion):
+        if self.upgrade_code is not None:
+            msilib.add_data(self.db, 'Upgrade',
+                    [(self.upgrade_code, None, sversion, None, 513, None,
+                            "REMOVEOLDVERSION"),
+                     (self.upgrade_code, sversion, None, None, 257, None,
+                            "REMOVENEWVERSION")
+                    ])
+
+    def add_user_exit_dialog(self):
+        dialog = distutils.command.bdist_msi.PyDialog(self.db, "UserExit",
+                self.x, self.y, self.width, self.height, self.modal,
+                self.title, "Finish", "Finish", "Finish")
+        dialog.title("[ProductName] installer was interrupted")
+        dialog.back("< Back", "Finish", active = False)
+        dialog.cancel("Cancel", "Back", active = False)
+        dialog.text("Description1", 15, 70, 320, 80, 0x30003,
+                "[ProductName] setup was interrupted. Your system has not "
+                "been modified. To install this program at a later time, "
+                "please run the installation again.")
+        dialog.text("Description2", 15, 155, 320, 20, 0x30003,
+                "Click the Finish button to exit the installer.")
+        button = dialog.next("Finish", "Cancel", name = "Finish")
+        button.event("EndDialog", "Exit")
+
+    def add_wait_for_costing_dialog(self):
+        dialog = msilib.Dialog(self.db, "WaitForCostingDlg", 50, 10, 260, 85,
+                self.modal, self.title, "Return", "Return", "Return")
+        dialog.text("Text", 48, 15, 194, 30, 3,
+                "Please wait while the installer finishes determining your "
+                "disk space requirements.")
+        button = dialog.pushbutton("Return", 102, 57, 56, 17, 3, "Return",
+                None)
+        button.event("EndDialog", "Exit")
+
+    def get_initial_target_dir(self, fullname):
+        return r"[ProgramFilesFolder]\%s" % fullname
+
+    def get_installer_filename(self, fullname):
+        return os.path.join(self.dist_dir, "%s.msi" % fullname)
+
+    def initialize_options(self):
+        distutils.command.bdist_msi.bdist_msi.initialize_options(self)
+        self.upgrade_code = None
+        self.add_to_path = None
+
+    def run(self):
+        if not self.skip_build:
+            self.run_command('build')
+        install = self.reinitialize_command('install', reinit_subcommands = 1)
+        install.prefix = self.bdist_dir
+        install.skip_build = self.skip_build
+        install.warn_dir = 0
+        distutils.log.info("installing to %s", self.bdist_dir)
+        install.ensure_finalized()
+        install.run()
+        self.mkpath(self.dist_dir)
+        fullname = self.distribution.get_fullname()
+        filename = os.path.abspath(self.get_installer_filename(fullname))
+        if os.path.exists(filename):
+            os.unlink(filename)
+        metadata = self.distribution.metadata
+        author = metadata.author or metadata.maintainer or "UNKNOWN"
+        version = metadata.get_version()
+        sversion = "%d.%d.%d" % \
+                distutils.version.StrictVersion(version).version
+        self.db = msilib.init_database(filename, msilib.schema,
+                self.distribution.metadata.name, msilib.gen_uuid(), sversion,
+                author)
+        msilib.add_tables(self.db, msilib.sequence)
+        self.add_properties()
+        self.add_config(fullname)
+        self.add_upgrade_config(sversion)
+        self.add_ui()
+        self.add_files()
+        self.db.Commit()
+        if not self.keep_temp:
+            distutils.dir_util.remove_tree(self.bdist_dir,
+                    dry_run = self.dry_run)
+
diff --git a/installer/cx_Freeze/cxfreeze b/installer/cx_Freeze/cxfreeze
new file mode 100755
index 0000000000..acd6789833
--- /dev/null
+++ b/installer/cx_Freeze/cxfreeze
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+
+from cx_Freeze import main
+
+main()
+
diff --git a/installer/cx_Freeze/initscripts/Console.py b/installer/cx_Freeze/initscripts/Console.py
new file mode 100755
index 0000000000..e10649d722
--- /dev/null
+++ b/installer/cx_Freeze/initscripts/Console.py
@@ -0,0 +1,35 @@
+#------------------------------------------------------------------------------
+# Console.py
+#   Initialization script for cx_Freeze which manipulates the path so that the
+# directory in which the executable is found is searched for extensions but
+# no other directory is searched. It also sets the attribute sys.frozen so that
+# the Win32 extensions behave as expected.
+#------------------------------------------------------------------------------
+
+import encodings
+import os
+import sys
+import warnings
+import zipimport
+
+sys.frozen = True
+sys.path = sys.path[:4]
+
+os.environ["TCL_LIBRARY"] = os.path.join(DIR_NAME, "tcl")
+os.environ["TK_LIBRARY"] = os.path.join(DIR_NAME, "tk")
+
+m = __import__("__main__")
+importer = zipimport.zipimporter(INITSCRIPT_ZIP_FILE_NAME)
+if INITSCRIPT_ZIP_FILE_NAME != SHARED_ZIP_FILE_NAME:
+    moduleName = m.__name__
+else:
+    name, ext = os.path.splitext(os.path.basename(os.path.normcase(FILE_NAME)))
+    moduleName = "%s__main__" % name
+code = importer.get_code(moduleName)
+exec code in m.__dict__
+
+if sys.version_info[:2] >= (2, 5):
+    module = sys.modules.get("threading")
+    if module is not None:
+        module._shutdown()
+
diff --git a/installer/cx_Freeze/initscripts/ConsoleKeepPath.py b/installer/cx_Freeze/initscripts/ConsoleKeepPath.py
new file mode 100755
index 0000000000..60151a1ff6
--- /dev/null
+++ b/installer/cx_Freeze/initscripts/ConsoleKeepPath.py
@@ -0,0 +1,19 @@
+#------------------------------------------------------------------------------
+# ConsoleKeepPath.py
+#   Initialization script for cx_Freeze which leaves the path alone and does
+# not set the sys.frozen attribute.
+#------------------------------------------------------------------------------
+
+import sys
+import zipimport
+
+m = __import__("__main__")
+importer = zipimport.zipimporter(INITSCRIPT_ZIP_FILE_NAME)
+code = importer.get_code(m.__name__)
+exec code in m.__dict__
+
+if sys.version_info[:2] >= (2, 5):
+    module = sys.modules.get("threading")
+    if module is not None:
+        module._shutdown()
+
diff --git a/installer/cx_Freeze/initscripts/ConsoleSetLibPath.py b/installer/cx_Freeze/initscripts/ConsoleSetLibPath.py
new file mode 100755
index 0000000000..b558652c0a
--- /dev/null
+++ b/installer/cx_Freeze/initscripts/ConsoleSetLibPath.py
@@ -0,0 +1,38 @@
+#------------------------------------------------------------------------------
+# ConsoleSetLibPath.py
+#   Initialization script for cx_Freeze which manipulates the path so that the
+# directory in which the executable is found is searched for extensions but
+# no other directory is searched. The environment variable LD_LIBRARY_PATH is
+# manipulated first, however, to ensure that shared libraries found in the
+# target directory are found. This requires a restart of the executable because
+# the environment variable LD_LIBRARY_PATH is only checked at startup.
+#------------------------------------------------------------------------------
+
+import encodings
+import os
+import sys
+import warnings
+import zipimport
+
+paths = os.environ.get("LD_LIBRARY_PATH", "").split(os.pathsep)
+if DIR_NAME not in paths:
+    paths.insert(0, DIR_NAME)
+    os.environ["LD_LIBRARY_PATH"] = os.pathsep.join(paths)
+    os.execv(sys.executable, sys.argv)
+
+sys.frozen = True
+sys.path = sys.path[:4]
+
+os.environ["TCL_LIBRARY"] = os.path.join(DIR_NAME, "tcl")
+os.environ["TK_LIBRARY"] = os.path.join(DIR_NAME, "tk")
+
+m = __import__("__main__")
+importer = zipimport.zipimporter(INITSCRIPT_ZIP_FILE_NAME)
+code = importer.get_code(m.__name__)
+exec code in m.__dict__
+
+if sys.version_info[:2] >= (2, 5):
+    module = sys.modules.get("threading")
+    if module is not None:
+        module._shutdown()
+
diff --git a/installer/cx_Freeze/initscripts/SharedLib.py b/installer/cx_Freeze/initscripts/SharedLib.py
new file mode 100755
index 0000000000..0445367010
--- /dev/null
+++ b/installer/cx_Freeze/initscripts/SharedLib.py
@@ -0,0 +1,20 @@
+#------------------------------------------------------------------------------
+# SharedLib.py
+#   Initialization script for cx_Freeze which behaves similarly to the one for
+# console based applications but must handle the case where Python has already
+# been initialized and another DLL of this kind has been loaded. As such it
+# does not block the path unless sys.frozen is not already set.
+#------------------------------------------------------------------------------
+
+import encodings
+import os
+import sys
+import warnings
+
+if not hasattr(sys, "frozen"):
+    sys.frozen = True
+    sys.path = sys.path[:4]
+
+os.environ["TCL_LIBRARY"] = os.path.join(DIR_NAME, "tcl")
+os.environ["TK_LIBRARY"] = os.path.join(DIR_NAME, "tk")
+
diff --git a/installer/cx_Freeze/initscripts/SharedLibSource.py b/installer/cx_Freeze/initscripts/SharedLibSource.py
new file mode 100755
index 0000000000..3edae93694
--- /dev/null
+++ b/installer/cx_Freeze/initscripts/SharedLibSource.py
@@ -0,0 +1,23 @@
+#------------------------------------------------------------------------------
+# SharedLibSource.py
+#   Initialization script for cx_Freeze which imports the site module (as per
+# normal processing of a Python script) and then searches for a file with the
+# same name as the shared library but with the extension .pth. The entries in
+# this file are used to modify the path to use for subsequent imports.
+#------------------------------------------------------------------------------
+
+import os
+import sys
+import warnings
+
+# the site module must be imported for normal behavior to take place; it is
+# done dynamically so that cx_Freeze will not add all modules referenced by
+# the site module to the frozen executable
+__import__("site")
+
+# now locate the pth file to modify the path appropriately
+baseName, ext = os.path.splitext(FILE_NAME)
+pathFileName = baseName + ".pth"
+sys.path = [s.strip() for s in file(pathFileName).read().splitlines()] + \
+        sys.path
+
diff --git a/installer/cx_Freeze/samples/advanced/advanced_1.py b/installer/cx_Freeze/samples/advanced/advanced_1.py
new file mode 100644
index 0000000000..2f1b68bceb
--- /dev/null
+++ b/installer/cx_Freeze/samples/advanced/advanced_1.py
@@ -0,0 +1,7 @@
+import sys
+
+print "Hello from cx_Freeze Advanced #1"
+print
+
+module = __import__("testfreeze_1")
+
diff --git a/installer/cx_Freeze/samples/advanced/advanced_2.py b/installer/cx_Freeze/samples/advanced/advanced_2.py
new file mode 100644
index 0000000000..1a6fe37e62
--- /dev/null
+++ b/installer/cx_Freeze/samples/advanced/advanced_2.py
@@ -0,0 +1,7 @@
+import sys
+
+print "Hello from cx_Freeze Advanced #2"
+print
+
+module = __import__("testfreeze_2")
+
diff --git a/installer/cx_Freeze/samples/advanced/modules/testfreeze_1.py b/installer/cx_Freeze/samples/advanced/modules/testfreeze_1.py
new file mode 100644
index 0000000000..6157b72a69
--- /dev/null
+++ b/installer/cx_Freeze/samples/advanced/modules/testfreeze_1.py
@@ -0,0 +1 @@
+print "Test freeze module #1"
diff --git a/installer/cx_Freeze/samples/advanced/modules/testfreeze_2.py b/installer/cx_Freeze/samples/advanced/modules/testfreeze_2.py
new file mode 100644
index 0000000000..ca133a7d58
--- /dev/null
+++ b/installer/cx_Freeze/samples/advanced/modules/testfreeze_2.py
@@ -0,0 +1 @@
+print "Test freeze module #2"
diff --git a/installer/cx_Freeze/samples/advanced/setup.py b/installer/cx_Freeze/samples/advanced/setup.py
new file mode 100644
index 0000000000..3a79cf23af
--- /dev/null
+++ b/installer/cx_Freeze/samples/advanced/setup.py
@@ -0,0 +1,31 @@
+# An advanced setup script to create multiple executables and demonstrate a few
+# of the features available to setup scripts
+#
+# hello.py is a very simple "Hello, world" type script which also displays the
+# environment in which the script runs
+#
+# Run the build process by running the command 'python setup.py build'
+#
+# If everything works well you should find a subdirectory in the build
+# subdirectory that contains the files needed to run the script without Python
+
+import sys
+from cx_Freeze import setup, Executable
+
+executables = [
+        Executable("advanced_1.py"),
+        Executable("advanced_2.py")
+]
+
+buildOptions = dict(
+        compressed = True,
+        includes = ["testfreeze_1", "testfreeze_2"],
+        path = sys.path + ["modules"])
+
+setup(
+        name = "advanced_cx_Freeze_sample",
+        version = "0.1",
+        description = "Advanced sample cx_Freeze script",
+        options = dict(build_exe = buildOptions),
+        executables = executables)
+
diff --git a/installer/cx_Freeze/samples/matplotlib/setup.py b/installer/cx_Freeze/samples/matplotlib/setup.py
new file mode 100644
index 0000000000..54bd97fc3f
--- /dev/null
+++ b/installer/cx_Freeze/samples/matplotlib/setup.py
@@ -0,0 +1,27 @@
+# A simple setup script to create an executable using matplotlib.
+#
+# test_matplotlib.py is a very simple matplotlib application that demonstrates
+# its use.
+#
+# Run the build process by running the command 'python setup.py build'
+#
+# If everything works well you should find a subdirectory in the build
+# subdirectory that contains the files needed to run the application
+
+import cx_Freeze
+import sys
+
+base = None
+if sys.platform == "win32":
+    base = "Win32GUI"
+
+executables = [
+        cx_Freeze.Executable("test_matplotlib.py", base = base)
+]
+
+cx_Freeze.setup(
+        name = "test_matplotlib",
+        version = "0.1",
+        description = "Sample matplotlib script",
+        executables = executables)
+
diff --git a/installer/cx_Freeze/samples/matplotlib/test_matplotlib.py b/installer/cx_Freeze/samples/matplotlib/test_matplotlib.py
new file mode 100644
index 0000000000..2029845ca5
--- /dev/null
+++ b/installer/cx_Freeze/samples/matplotlib/test_matplotlib.py
@@ -0,0 +1,48 @@
+from numpy import arange, sin, pi
+import matplotlib
+matplotlib.use('WXAgg')
+from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as FigureCanvas
+from matplotlib.backends.backend_wx import NavigationToolbar2Wx
+from matplotlib.figure import Figure
+from wx import *
+
+class CanvasFrame(Frame):
+   def __init__(self):
+       Frame.__init__(self,None,-1, 'CanvasFrame',size=(550,350))
+       self.SetBackgroundColour(NamedColor("WHITE"))
+       self.figure = Figure()
+       self.axes = self.figure.add_subplot(111)
+       t = arange(0.0,3.0,0.01)
+       s = sin(2*pi*t)
+       self.axes.plot(t,s)
+       self.canvas = FigureCanvas(self, -1, self.figure)
+       self.sizer = BoxSizer(VERTICAL)
+       self.sizer.Add(self.canvas, 1, LEFT | TOP | GROW)
+       self.SetSizerAndFit(self.sizer)
+       self.add_toolbar()
+
+   def add_toolbar(self):
+       self.toolbar = NavigationToolbar2Wx(self.canvas)
+       self.toolbar.Realize()
+       if Platform == '__WXMAC__':
+           self.SetToolBar(self.toolbar)
+       else:
+           tw, th = self.toolbar.GetSizeTuple()
+           fw, fh = self.canvas.GetSizeTuple()
+           self.toolbar.SetSize(Size(fw, th))
+           self.sizer.Add(self.toolbar, 0, LEFT | EXPAND)
+       self.toolbar.update()
+
+   def OnPaint(self, event):
+       self.canvas.draw()
+
+class App(App):
+   def OnInit(self):
+       'Create the main window and insert the custom frame'
+       frame = CanvasFrame()
+       frame.Show(True)
+       return True
+
+app = App(0)
+app.MainLoop()
+
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/__init__.py b/installer/cx_Freeze/samples/relimport/pkg1/__init__.py
new file mode 100644
index 0000000000..5a170fd2dd
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/__init__.py
@@ -0,0 +1,3 @@
+print "importing pkg1"
+from . import sub1
+from . import pkg2
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/pkg2/__init__.py b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/__init__.py
new file mode 100644
index 0000000000..71e0b1fbe6
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/__init__.py
@@ -0,0 +1,3 @@
+print "importing pkg1.pkg2"
+from . import sub3
+from .. import sub4
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub3.py b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub3.py
new file mode 100644
index 0000000000..1719aadb41
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub3.py
@@ -0,0 +1,3 @@
+print "importing pkg1.pkg2.sub3"
+from . import sub5
+from .. import sub6
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub5.py b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub5.py
new file mode 100644
index 0000000000..1c91b8fa23
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/pkg2/sub5.py
@@ -0,0 +1 @@
+print "importing pkg1.pkg2.sub5"
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/sub1.py b/installer/cx_Freeze/samples/relimport/pkg1/sub1.py
new file mode 100644
index 0000000000..514bd88a87
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/sub1.py
@@ -0,0 +1,2 @@
+print "importing pkg1.sub1"
+from . import sub2
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/sub2.py b/installer/cx_Freeze/samples/relimport/pkg1/sub2.py
new file mode 100644
index 0000000000..63a0838b25
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/sub2.py
@@ -0,0 +1 @@
+print "importing pkg1.sub2"
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/sub4.py b/installer/cx_Freeze/samples/relimport/pkg1/sub4.py
new file mode 100644
index 0000000000..3a8e760e43
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/sub4.py
@@ -0,0 +1 @@
+print 'importing pkg1.sub4'
diff --git a/installer/cx_Freeze/samples/relimport/pkg1/sub6.py b/installer/cx_Freeze/samples/relimport/pkg1/sub6.py
new file mode 100644
index 0000000000..1e7d7955d6
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/pkg1/sub6.py
@@ -0,0 +1 @@
+print "importing pkg1.sub6"
diff --git a/installer/cx_Freeze/samples/relimport/relimport.py b/installer/cx_Freeze/samples/relimport/relimport.py
new file mode 100644
index 0000000000..39cb50c91d
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/relimport.py
@@ -0,0 +1 @@
+import pkg1
diff --git a/installer/cx_Freeze/samples/relimport/setup.py b/installer/cx_Freeze/samples/relimport/setup.py
new file mode 100644
index 0000000000..b8b3f3853b
--- /dev/null
+++ b/installer/cx_Freeze/samples/relimport/setup.py
@@ -0,0 +1,16 @@
+# relimport.py is a very simple script that tests importing using relative
+# imports (available in Python 2.5 and up)
+#
+# Run the build process by running the command 'python setup.py build'
+#
+# If everything works well you should find a subdirectory in the build
+# subdirectory that contains the files needed to run the script without Python
+
+from cx_Freeze import setup, Executable
+
+setup(
+        name = "relimport",
+        version = "0.1",
+        description = "Sample cx_Freeze script for relative imports",
+        executables = [Executable("relimport.py")])
+
diff --git a/installer/cx_Freeze/samples/simple/hello.py b/installer/cx_Freeze/samples/simple/hello.py
new file mode 100644
index 0000000000..0fb32405bc
--- /dev/null
+++ b/installer/cx_Freeze/samples/simple/hello.py
@@ -0,0 +1,19 @@
+import sys
+
+print "Hello from cx_Freeze"
+print
+
+print "sys.executable", sys.executable
+print "sys.prefix", sys.prefix
+print
+
+print "ARGUMENTS:"
+for a in sys.argv:
+    print a
+print
+
+print "PATH:"
+for p in sys.path:
+    print p
+print
+
diff --git a/installer/cx_Freeze/samples/simple/setup.py b/installer/cx_Freeze/samples/simple/setup.py
new file mode 100644
index 0000000000..25de838b10
--- /dev/null
+++ b/installer/cx_Freeze/samples/simple/setup.py
@@ -0,0 +1,18 @@
+# A very simple setup script to create a single executable
+#
+# hello.py is a very simple "Hello, world" type script which also displays the
+# environment in which the script runs
+#
+# Run the build process by running the command 'python setup.py build'
+#
+# If everything works well you should find a subdirectory in the build
+# subdirectory that contains the files needed to run the script without Python
+
+from cx_Freeze import setup, Executable
+
+setup(
+        name = "hello",
+        version = "0.1",
+        description = "Sample cx_Freeze script",
+        executables = [Executable("hello.py")])
+
diff --git a/installer/cx_Freeze/samples/wx/setup.py b/installer/cx_Freeze/samples/wx/setup.py
new file mode 100644
index 0000000000..9412996859
--- /dev/null
+++ b/installer/cx_Freeze/samples/wx/setup.py
@@ -0,0 +1,25 @@
+# A simple setup script to create an executable running wxPython. This also
+# demonstrates the method for creating a Windows executable that does not have
+# an associated console.
+#
+# wxapp.py is a very simple "Hello, world" type wxPython application
+#
+# Run the build process by running the command 'python setup.py build'
+#
+# If everything works well you should find a subdirectory in the build
+# subdirectory that contains the files needed to run the application
+
+import sys
+
+from cx_Freeze import setup, Executable
+
+base = None
+if sys.platform == "win32":
+    base = "Win32GUI"
+
+setup(
+        name = "hello",
+        version = "0.1",
+        description = "Sample cx_Freeze wxPython script",
+        executables = [Executable("wxapp.py", base = base)])
+
diff --git a/installer/cx_Freeze/samples/wx/wxapp.py b/installer/cx_Freeze/samples/wx/wxapp.py
new file mode 100644
index 0000000000..7baa90b8d1
--- /dev/null
+++ b/installer/cx_Freeze/samples/wx/wxapp.py
@@ -0,0 +1,42 @@
+import wx
+
+class Frame(wx.Frame):
+
+    def __init__(self):
+        wx.Frame.__init__(self, parent = None, title = "Hello from cx_Freeze")
+        panel = wx.Panel(self)
+        closeMeButton = wx.Button(panel, -1, "Close Me")
+        wx.EVT_BUTTON(self, closeMeButton.GetId(), self.OnCloseMe)
+        wx.EVT_CLOSE(self, self.OnCloseWindow)
+        pushMeButton = wx.Button(panel, -1, "Push Me")
+        wx.EVT_BUTTON(self, pushMeButton.GetId(), self.OnPushMe)
+        sizer = wx.BoxSizer(wx.HORIZONTAL)
+        sizer.Add(closeMeButton, flag = wx.ALL, border = 20)
+        sizer.Add(pushMeButton, flag = wx.ALL, border = 20)
+        panel.SetSizer(sizer)
+        topSizer = wx.BoxSizer(wx.VERTICAL)
+        topSizer.Add(panel, flag = wx.ALL | wx.EXPAND)
+        topSizer.Fit(self)
+
+    def OnCloseMe(self, event):
+        self.Close(True)
+
+    def OnPushMe(self, event):
+        1 / 0
+
+    def OnCloseWindow(self, event):
+        self.Destroy()
+
+
+class App(wx.App):
+
+    def OnInit(self):
+        frame = Frame()
+        frame.Show(True)
+        self.SetTopWindow(frame)
+        return True
+
+
+app = App(1)
+app.MainLoop()
+
diff --git a/installer/cx_Freeze/setup.py b/installer/cx_Freeze/setup.py
new file mode 100755
index 0000000000..b51453aa7a
--- /dev/null
+++ b/installer/cx_Freeze/setup.py
@@ -0,0 +1,197 @@
+"""
+Distutils script for cx_Freeze.
+"""
+
+import distutils.command.bdist_rpm
+import distutils.command.build_ext
+import distutils.command.build_scripts
+import distutils.command.install
+import distutils.command.install_data
+import distutils.sysconfig
+import os
+import sys
+
+from distutils.core import setup
+from distutils.extension import Extension
+
+class bdist_rpm(distutils.command.bdist_rpm.bdist_rpm):
+
+    # rpm automatically byte compiles all Python files in a package but we
+    # don't want that to happen for initscripts and samples so we tell it to
+    # ignore those files
+    def _make_spec_file(self):
+        specFile = distutils.command.bdist_rpm.bdist_rpm._make_spec_file(self)
+        specFile.insert(0, "%define _unpackaged_files_terminate_build 0%{nil}")
+        return specFile
+
+    def run(self):
+        distutils.command.bdist_rpm.bdist_rpm.run(self)
+        specFile = os.path.join(self.rpm_base, "SPECS",
+                "%s.spec" % self.distribution.get_name())
+        queryFormat = "%{name}-%{version}-%{release}.%{arch}.rpm"
+        command = "rpm -q --qf '%s' --specfile %s" % (queryFormat, specFile)
+        origFileName = os.popen(command).read()
+        parts = origFileName.split("-")
+        parts.insert(2, "py%s%s" % sys.version_info[:2])
+        newFileName = "-".join(parts)
+        self.move_file(os.path.join("dist", origFileName),
+                os.path.join("dist", newFileName))
+
+
+class build_ext(distutils.command.build_ext.build_ext):
+
+    def build_extension(self, ext):
+        if ext.name.find("bases") < 0:
+            distutils.command.build_ext.build_ext.build_extension(self, ext)
+            return
+        os.environ["LD_RUN_PATH"] = "${ORIGIN}:${ORIGIN}/../lib"
+        objects = self.compiler.compile(ext.sources,
+                output_dir = self.build_temp,
+                include_dirs = ext.include_dirs,
+                debug = self.debug,
+                depends = ext.depends)
+        fileName = os.path.splitext(self.get_ext_filename(ext.name))[0]
+        fullName = os.path.join(self.build_lib, fileName)
+        libraryDirs = ext.library_dirs or []
+        libraries = self.get_libraries(ext)
+        extraArgs = ext.extra_link_args or []
+        if sys.platform != "win32":
+            vars = distutils.sysconfig.get_config_vars()
+            libraryDirs.append(vars["LIBPL"])
+            libraries.append("python%s.%s" % sys.version_info[:2])
+            if vars["LINKFORSHARED"]:
+                extraArgs.extend(vars["LINKFORSHARED"].split())
+            if vars["LIBS"]:
+                extraArgs.extend(vars["LIBS"].split())
+            if vars["LIBM"]:
+                extraArgs.append(vars["LIBM"])
+            if vars["BASEMODLIBS"]:
+                extraArgs.extend(vars["BASEMODLIBS"].split())
+            if vars["LOCALMODLIBS"]:
+                extraArgs.extend(vars["LOCALMODLIBS"].split())
+            extraArgs.append("-s")
+        self.compiler.link_executable(objects, fullName,
+                libraries = libraries,
+                library_dirs = libraryDirs,
+                runtime_library_dirs = ext.runtime_library_dirs,
+                extra_postargs = extraArgs,
+                debug = self.debug)
+
+    def get_ext_filename(self, name):
+        fileName = distutils.command.build_ext.build_ext.get_ext_filename(self,
+                name)
+        if name.find("bases") < 0:
+            return fileName
+        ext = self.compiler.exe_extension or ""
+        return os.path.splitext(fileName)[0] + ext
+
+
+class build_scripts(distutils.command.build_scripts.build_scripts):
+
+    def copy_scripts(self):
+        distutils.command.build_scripts.build_scripts.copy_scripts(self)
+        if sys.platform == "win32":
+            for script in self.scripts:
+                batFileName = os.path.join(self.build_dir, script + ".bat")
+                fullScriptName = r"%s\Scripts\%s" % \
+                        (os.path.dirname(sys.executable), script)
+                command = "%s %s %%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9" % \
+                        (sys.executable, fullScriptName)
+                file(batFileName, "w").write("@echo off\n\n%s" % command)
+
+
+class install(distutils.command.install.install):
+
+    def get_sub_commands(self):
+        subCommands = distutils.command.install.install.get_sub_commands(self)
+        subCommands.append("install_packagedata")
+        return subCommands
+
+
+class install_packagedata(distutils.command.install_data.install_data):
+
+    def run(self):
+        installCommand = self.get_finalized_command("install")
+        installDir = getattr(installCommand, "install_lib")
+        sourceDirs = ["samples", "initscripts"]
+        while sourceDirs:
+            sourceDir = sourceDirs.pop(0)
+            targetDir = os.path.join(installDir, "cx_Freeze", sourceDir)
+            self.mkpath(targetDir)
+            for name in os.listdir(sourceDir):
+                if name == "build" or name.startswith("."):
+                    continue
+                fullSourceName = os.path.join(sourceDir, name)
+                if os.path.isdir(fullSourceName):
+                    sourceDirs.append(fullSourceName)
+                else:
+                    fullTargetName = os.path.join(targetDir, name)
+                    self.copy_file(fullSourceName, fullTargetName)
+                    self.outfiles.append(fullTargetName)
+
+
+commandClasses = dict(
+        build_ext = build_ext,
+        build_scripts = build_scripts,
+        bdist_rpm = bdist_rpm,
+        install = install,
+        install_packagedata = install_packagedata)
+
+if sys.platform == "win32":
+    libraries = ["imagehlp"]
+else:
+    libraries = []
+utilModule = Extension("cx_Freeze.util", ["source/util.c"],
+        libraries = libraries)
+depends = ["source/bases/Common.c"]
+if sys.platform == "win32":
+    if sys.version_info[:2] >= (2, 6):
+        extraSources = ["source/bases/manifest.rc"]
+    else:
+        extraSources = ["source/bases/dummy.rc"]
+else:
+    extraSources = []
+console = Extension("cx_Freeze.bases.Console",
+        ["source/bases/Console.c"] + extraSources, depends = depends)
+consoleKeepPath = Extension("cx_Freeze.bases.ConsoleKeepPath",
+        ["source/bases/ConsoleKeepPath.c"] + extraSources, depends = depends)
+extensions = [utilModule, console, consoleKeepPath]
+if sys.platform == "win32":
+    gui = Extension("cx_Freeze.bases.Win32GUI",
+            ["source/bases/Win32GUI.c"] + extraSources,
+            depends = depends, extra_link_args = ["-mwindows"])
+    extensions.append(gui)
+
+docFiles = "LICENSE.txt README.txt HISTORY.txt doc/cx_Freeze.html"
+
+classifiers = [
+        "Development Status :: 5 - Production/Stable",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Python Software Foundation License",
+        "Natural Language :: English",
+        "Operating System :: OS Independent",
+        "Programming Language :: C",
+        "Programming Language :: Python",
+        "Topic :: Software Development :: Build Tools",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        "Topic :: System :: Software Distribution",
+        "Topic :: Utilities"
+]
+
+setup(name = "cx_Freeze",
+        description = "create standalone executables from Python scripts",
+        long_description = "create standalone executables from Python scripts",
+        version = "4.0.1",
+        cmdclass = commandClasses,
+        options = dict(bdist_rpm = dict(doc_files = docFiles),
+                install = dict(optimize = 1)),
+        ext_modules = extensions,
+        packages = ['cx_Freeze'],
+        maintainer="Anthony Tuininga",
+        maintainer_email="anthony.tuininga@gmail.com",
+        url = "http://cx-freeze.sourceforge.net",
+        scripts = ["cxfreeze"],
+        classifiers = classifiers,
+        keywords = "freeze",
+        license = "Python Software Foundation License")
+
diff --git a/installer/cx_Freeze/source/bases/Common.c b/installer/cx_Freeze/source/bases/Common.c
new file mode 100644
index 0000000000..ce1e137ebb
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/Common.c
@@ -0,0 +1,262 @@
+//-----------------------------------------------------------------------------
+// Common.c
+//   Routines which are common to running frozen executables.
+//-----------------------------------------------------------------------------
+
+#include <compile.h>
+#include <eval.h>
+#include <osdefs.h>
+
+// global variables (used for simplicity)
+static PyObject *g_FileName = NULL;
+static PyObject *g_DirName = NULL;
+static PyObject *g_ExclusiveZipFileName = NULL;
+static PyObject *g_SharedZipFileName = NULL;
+static PyObject *g_InitScriptZipFileName = NULL;
+
+//-----------------------------------------------------------------------------
+// GetDirName()
+//   Return the directory name of the given path.
+//-----------------------------------------------------------------------------
+static int GetDirName(
+    const char *path,                   // path to calculate dir name for
+    PyObject **dirName)                 // directory name (OUT)
+{
+    int i;
+
+    for (i = strlen(path); i > 0 && path[i] != SEP; --i);
+    *dirName = PyString_FromStringAndSize(path, i);
+    if (!*dirName)
+        return FatalError("cannot create string for directory name");
+    return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// SetExecutableName()
+//   Set the script to execute and calculate the directory in which the
+// executable is found as well as the exclusive (only for this executable) and
+// shared zip file names.
+//-----------------------------------------------------------------------------
+static int SetExecutableName(
+    const char *fileName)               // script to execute
+{
+    char temp[MAXPATHLEN + 12], *ptr;
+#ifndef WIN32
+    char linkData[MAXPATHLEN + 1];
+    struct stat statData;
+    size_t linkSize, i;
+    PyObject *dirName;
+#endif
+
+    // store file name
+    g_FileName = PyString_FromString(fileName);
+    if (!g_FileName)
+        return FatalError("cannot create string for file name");
+
+#ifndef WIN32
+    for (i = 0; i < 25; i++) {
+        if (lstat(fileName, &statData) < 0) {
+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, (char*) fileName);
+            return FatalError("unable to stat file");
+        }
+        if (!S_ISLNK(statData.st_mode))
+            break;
+        linkSize = readlink(fileName, linkData, sizeof(linkData));
+        if (linkSize < 0) {
+            PyErr_SetFromErrnoWithFilename(PyExc_OSError, (char*) fileName);
+            return FatalError("unable to stat file");
+        }
+        if (linkData[0] == '/') {
+            Py_DECREF(g_FileName);
+            g_FileName = PyString_FromStringAndSize(linkData, linkSize);
+        } else {
+            if (GetDirName(PyString_AS_STRING(g_FileName), &dirName) < 0)
+                return -1;
+            if (PyString_GET_SIZE(dirName) + linkSize + 1 > MAXPATHLEN) {
+                Py_DECREF(dirName);
+                return FatalError("cannot dereference link, path too large");
+            }
+            strcpy(temp, PyString_AS_STRING(dirName));
+            strcat(temp, "/");
+            strcat(temp, linkData);
+            Py_DECREF(g_FileName);
+            g_FileName = PyString_FromString(temp);
+        }
+        if (!g_FileName)
+            return FatalError("cannot create string for linked file name");
+        fileName = PyString_AS_STRING(g_FileName);
+    }
+#endif
+
+    // calculate and store directory name
+    if (GetDirName(fileName, &g_DirName) < 0)
+        return -1;
+
+    // calculate and store exclusive zip file name
+    strcpy(temp, fileName);
+    ptr = temp + strlen(temp) - 1;
+    while (ptr > temp && *ptr != SEP && *ptr != '.')
+        ptr--;
+    if (*ptr == '.')
+        *ptr = '\0';
+    strcat(temp, ".zip");
+    g_ExclusiveZipFileName = PyString_FromString(temp);
+    if (!g_ExclusiveZipFileName)
+        return FatalError("cannot create string for exclusive zip file name");
+
+    // calculate and store shared zip file name
+    strcpy(temp, PyString_AS_STRING(g_DirName));
+    ptr = temp + strlen(temp);
+    *ptr++ = SEP;
+    strcpy(ptr, "library.zip");
+    g_SharedZipFileName = PyString_FromString(temp);
+    if (!g_SharedZipFileName)
+        return FatalError("cannot create string for shared zip file name");
+
+    return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// SetPathToSearch()
+//   Set the path to search. This includes the file (for those situations where
+// a zip file is attached to the executable itself), the directory where the
+// executable is found (to search for extensions), the exclusive zip file
+// name and the shared zip file name.
+//-----------------------------------------------------------------------------
+static int SetPathToSearch(void)
+{
+    PyObject *pathList;
+
+    pathList = PySys_GetObject("path");
+    if (!pathList)
+        return FatalError("cannot acquire sys.path");
+    if (PyList_Insert(pathList, 0, g_FileName) < 0)
+        return FatalError("cannot insert file name into sys.path");
+    if (PyList_Insert(pathList, 1, g_DirName) < 0)
+        return FatalError("cannot insert directory name into sys.path");
+    if (PyList_Insert(pathList, 2, g_ExclusiveZipFileName) < 0)
+        return FatalError("cannot insert exclusive zip name into sys.path");
+    if (PyList_Insert(pathList, 3, g_SharedZipFileName) < 0)
+        return FatalError("cannot insert shared zip name into sys.path");
+    return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// GetImporterHelper()
+//   Helper which is used to locate the importer for the initscript.
+//-----------------------------------------------------------------------------
+static PyObject *GetImporterHelper(
+    PyObject *module,                   // zipimport module
+    PyObject *fileName)                 // name of file to search
+{
+    PyObject *importer;
+
+    importer = PyObject_CallMethod(module, "zipimporter", "O", fileName);
+    if (importer)
+        g_InitScriptZipFileName = fileName;
+    else
+        PyErr_Clear();
+    return importer;
+}
+
+
+//-----------------------------------------------------------------------------
+// GetImporter()
+//   Return the importer which will be used for importing the initialization
+// script. The executable itself is searched first, followed by the exclusive
+// zip file and finally by the shared zip file.
+//-----------------------------------------------------------------------------
+static int GetImporter(
+    PyObject **importer)                // importer (OUT)
+{
+    PyObject *module;
+
+    module = PyImport_ImportModule("zipimport");
+    if (!module)
+        return FatalError("cannot import zipimport module");
+    *importer = GetImporterHelper(module, g_FileName);
+    if (!*importer) {
+        *importer = GetImporterHelper(module, g_ExclusiveZipFileName);
+        if (!*importer)
+            *importer = GetImporterHelper(module, g_SharedZipFileName);
+    }
+    Py_DECREF(module);
+    if (!*importer)
+        return FatalError("cannot get zipimporter instance");
+    return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// PopulateInitScriptDict()
+//   Return the dictionary used by the initialization script.
+//-----------------------------------------------------------------------------
+static int PopulateInitScriptDict(
+    PyObject *dict)                     // dictionary to populate
+{
+    if (!dict)
+        return FatalError("unable to create temporary dictionary");
+    if (PyDict_SetItemString(dict, "__builtins__", PyEval_GetBuiltins()) < 0)
+        return FatalError("unable to set __builtins__");
+    if (PyDict_SetItemString(dict, "FILE_NAME", g_FileName) < 0)
+        return FatalError("unable to set FILE_NAME");
+    if (PyDict_SetItemString(dict, "DIR_NAME", g_DirName) < 0)
+        return FatalError("unable to set DIR_NAME");
+    if (PyDict_SetItemString(dict, "EXCLUSIVE_ZIP_FILE_NAME",
+            g_ExclusiveZipFileName) < 0)
+        return FatalError("unable to set EXCLUSIVE_ZIP_FILE_NAME");
+    if (PyDict_SetItemString(dict, "SHARED_ZIP_FILE_NAME",
+            g_SharedZipFileName) < 0)
+        return FatalError("unable to set SHARED_ZIP_FILE_NAME");
+    if (PyDict_SetItemString(dict, "INITSCRIPT_ZIP_FILE_NAME",
+            g_InitScriptZipFileName) < 0)
+        return FatalError("unable to set INITSCRIPT_ZIP_FILE_NAME");
+    return 0;
+}
+
+
+
+
+//-----------------------------------------------------------------------------
+// ExecuteScript()
+//   Execute the script found within the file.
+//-----------------------------------------------------------------------------
+static int ExecuteScript(
+    const char *fileName)               // name of file containing Python code
+{
+    PyObject *importer, *dict, *code, *temp;
+
+    if (SetExecutableName(fileName) < 0)
+        return -1;
+    if (SetPathToSearch() < 0)
+        return -1;
+    importer = NULL;
+    if (GetImporter(&importer) < 0)
+        return -1;
+
+    // create and populate dictionary for initscript module
+    dict = PyDict_New();
+    if (PopulateInitScriptDict(dict) < 0) {
+        Py_XDECREF(dict);
+        Py_DECREF(importer);
+        return -1;
+    }
+
+    // locate and execute script
+    code = PyObject_CallMethod(importer, "get_code", "s", "cx_Freeze__init__");
+    Py_DECREF(importer);
+    if (!code)
+        return FatalError("unable to locate initialization module");
+    temp = PyEval_EvalCode( (PyCodeObject*) code, dict, dict);
+    Py_DECREF(code);
+    Py_DECREF(dict);
+    if (!temp)
+        return FatalScriptError();
+    Py_DECREF(temp);
+
+    return 0;
+}
+
diff --git a/installer/cx_Freeze/source/bases/Console.c b/installer/cx_Freeze/source/bases/Console.c
new file mode 100644
index 0000000000..d6a8a515a0
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/Console.c
@@ -0,0 +1,72 @@
+//-----------------------------------------------------------------------------
+// Console.c
+//   Main routine for frozen programs which run in a console.
+//-----------------------------------------------------------------------------
+
+#include <Python.h>
+#ifdef __WIN32__
+#include <windows.h>
+#endif
+
+//-----------------------------------------------------------------------------
+// FatalError()
+//   Prints a fatal error.
+//-----------------------------------------------------------------------------
+static int FatalError(
+    const char *message)                // message to print
+{
+    PyErr_Print();
+    Py_FatalError(message);
+    return -1;
+}
+
+
+//-----------------------------------------------------------------------------
+// FatalScriptError()
+//   Prints a fatal error in the initialization script.
+//-----------------------------------------------------------------------------
+static int FatalScriptError(void)
+{
+    PyErr_Print();
+    return -1;
+}
+
+
+#include "Common.c"
+
+
+//-----------------------------------------------------------------------------
+// main()
+//   Main routine for frozen programs.
+//-----------------------------------------------------------------------------
+int main(int argc, char **argv)
+{
+    const char *fileName;
+    char *encoding;
+
+    // initialize Python
+    Py_NoSiteFlag = 1;
+    Py_FrozenFlag = 1;
+    Py_IgnoreEnvironmentFlag = 1;
+
+    encoding = getenv("PYTHONIOENCODING");
+    if (encoding != NULL) { 
+        Py_FileSystemDefaultEncoding = strndup(encoding, 100);
+    }
+
+    Py_SetPythonHome("");
+    Py_SetProgramName(argv[0]);
+    fileName = Py_GetProgramFullPath();
+
+    Py_Initialize();
+    PySys_SetArgv(argc, argv);
+
+
+    // do the work
+    if (ExecuteScript(fileName) < 0)
+        return 1;
+
+    Py_Finalize();
+    return 0;
+}
+
diff --git a/installer/cx_Freeze/source/bases/ConsoleKeepPath.c b/installer/cx_Freeze/source/bases/ConsoleKeepPath.c
new file mode 100644
index 0000000000..3ad00f8488
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/ConsoleKeepPath.c
@@ -0,0 +1,60 @@
+//-----------------------------------------------------------------------------
+// ConsoleKeepPath.c
+//   Main routine for frozen programs which need a Python installation to do
+// their work.
+//-----------------------------------------------------------------------------
+
+#include <Python.h>
+#ifdef __WIN32__
+#include <windows.h>
+#endif
+
+//-----------------------------------------------------------------------------
+// FatalError()
+//   Prints a fatal error.
+//-----------------------------------------------------------------------------
+static int FatalError(
+    const char *message)                // message to print
+{
+    PyErr_Print();
+    Py_FatalError(message);
+    return -1;
+}
+
+
+//-----------------------------------------------------------------------------
+// FatalScriptError()
+//   Prints a fatal error in the initialization script.
+//-----------------------------------------------------------------------------
+static int FatalScriptError(void)
+{
+    PyErr_Print();
+    return -1;
+}
+
+
+#include "Common.c"
+
+
+//-----------------------------------------------------------------------------
+// main()
+//   Main routine for frozen programs.
+//-----------------------------------------------------------------------------
+int main(int argc, char **argv)
+{
+    const char *fileName;
+
+    // initialize Python
+    Py_SetProgramName(argv[0]);
+    fileName = Py_GetProgramFullPath();
+    Py_Initialize();
+    PySys_SetArgv(argc, argv);
+
+    // do the work
+    if (ExecuteScript(fileName) < 0)
+        return 1;
+
+    Py_Finalize();
+    return 0;
+}
+
diff --git a/installer/cx_Freeze/source/bases/Win32GUI.c b/installer/cx_Freeze/source/bases/Win32GUI.c
new file mode 100644
index 0000000000..f5bbe74dba
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/Win32GUI.c
@@ -0,0 +1,242 @@
+//-----------------------------------------------------------------------------
+// Win32GUI.c
+//   Main routine for frozen programs written for the Win32 GUI subsystem.
+//-----------------------------------------------------------------------------
+
+#include <Python.h>
+#include <windows.h>
+
+//-----------------------------------------------------------------------------
+// FatalError()
+//   Handle a fatal error.
+//-----------------------------------------------------------------------------
+static int FatalError(
+    char *a_Message)                    // message to display
+{
+    MessageBox(NULL, a_Message, "cx_Freeze Fatal Error", MB_ICONERROR);
+    Py_Finalize();
+    return -1;
+}
+
+
+//-----------------------------------------------------------------------------
+// StringifyObject()
+//   Stringify a Python object.
+//-----------------------------------------------------------------------------
+static char *StringifyObject(
+    PyObject *object,                   // object to stringify
+    PyObject **stringRep)               // string representation
+{
+    if (object) {
+        *stringRep = PyObject_Str(object);
+        if (*stringRep)
+            return PyString_AS_STRING(*stringRep);
+        return "Unable to stringify";
+    }
+
+    // object is NULL
+    *stringRep = NULL;
+    return "None";
+}
+
+
+//-----------------------------------------------------------------------------
+// FatalPythonErrorNoTraceback()
+//   Handle a fatal Python error without traceback.
+//-----------------------------------------------------------------------------
+static int FatalPythonErrorNoTraceback(
+    PyObject *origType,                 // exception type
+    PyObject *origValue,                // exception value
+    char *message)                      // message to display
+{
+    PyObject *typeStrRep, *valueStrRep, *origTypeStrRep, *origValueStrRep;
+    char *totalMessage, *typeStr, *valueStr, *origTypeStr, *origValueStr;
+    PyObject *type, *value, *traceback;
+    int totalMessageLength;
+    char *messageFormat;
+
+    // fetch error and string representations of the error
+    PyErr_Fetch(&type, &value, &traceback);
+    origTypeStr = StringifyObject(origType, &origTypeStrRep);
+    origValueStr = StringifyObject(origValue, &origValueStrRep);
+    typeStr = StringifyObject(type, &typeStrRep);
+    valueStr = StringifyObject(value, &valueStrRep);
+
+    // fill out the message to be displayed
+    messageFormat = "Type: %s\nValue: %s\nOther Type: %s\nOtherValue: %s\n%s";
+    totalMessageLength = strlen(origTypeStr) + strlen(origValueStr) +
+            strlen(typeStr) + strlen(valueStr) + strlen(message) +
+            strlen(messageFormat) + 1;
+    totalMessage = malloc(totalMessageLength);
+    if (!totalMessage)
+        return FatalError("Out of memory!");
+    sprintf(totalMessage, messageFormat, typeStr, valueStr, origTypeStr,
+            origValueStr, message);
+
+    // display the message
+    MessageBox(NULL, totalMessage,
+            "cx_Freeze: Python error in main script (traceback unavailable)",
+            MB_ICONERROR);
+    free(totalMessage);
+    return -1;
+}
+
+
+//-----------------------------------------------------------------------------
+// ArgumentValue()
+//   Return a suitable argument value by replacing NULL with Py_None.
+//-----------------------------------------------------------------------------
+static PyObject *ArgumentValue(
+    PyObject *object)                   // argument to massage
+{
+    if (object) {
+        Py_INCREF(object);
+        return object;
+    }
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+//-----------------------------------------------------------------------------
+// HandleSystemExitException()
+//   Handles a system exit exception differently. If an integer value is passed
+// through then that becomes the exit value; otherwise the string value of the
+// value passed through is displayed in a message box.
+//-----------------------------------------------------------------------------
+static void HandleSystemExitException()
+{
+    PyObject *type, *value, *traceback, *valueStr;
+    int exitCode = 0;
+    char *message;
+
+    PyErr_Fetch(&type, &value, &traceback);
+    if (PyInstance_Check(value)) {
+        PyObject *code = PyObject_GetAttrString(value, "code");
+        if (code) {
+            Py_DECREF(value);
+            value = code;
+            if (value == Py_None)
+                Py_Exit(0);
+        }
+    }
+    if (PyInt_Check(value))
+        exitCode = PyInt_AsLong(value);
+    else {
+        message = StringifyObject(value, &valueStr);
+        MessageBox(NULL, message, "cx_Freeze: Application Terminated",
+                MB_ICONERROR);
+        Py_XDECREF(valueStr);
+        exitCode = 1;
+    }
+    Py_Exit(exitCode);
+}
+
+
+//-----------------------------------------------------------------------------
+// FatalScriptError()
+//   Handle a fatal Python error with traceback.
+//-----------------------------------------------------------------------------
+static int FatalScriptError()
+{
+    PyObject *type, *value, *traceback, *argsTuple, *module, *method, *result;
+    int tracebackLength, i;
+    char *tracebackStr;
+
+    // if a system exception, handle it specially
+    if (PyErr_ExceptionMatches(PyExc_SystemExit))
+        HandleSystemExitException();
+
+    // get the exception details
+    PyErr_Fetch(&type, &value, &traceback);
+
+    // import the traceback module
+    module = PyImport_ImportModule("traceback");
+    if (!module)
+        return FatalPythonErrorNoTraceback(type, value,
+                "Cannot import traceback module.");
+
+    // get the format_exception method
+    method = PyObject_GetAttrString(module, "format_exception");
+    Py_DECREF(module);
+    if (!method)
+        return FatalPythonErrorNoTraceback(type, value,
+              "Cannot get format_exception method.");
+
+    // create a tuple for the arguments
+    argsTuple = PyTuple_New(3);
+    if (!argsTuple) {
+        Py_DECREF(method);
+        return FatalPythonErrorNoTraceback(type, value,
+                "Cannot create arguments tuple for traceback.");
+    }
+    PyTuple_SET_ITEM(argsTuple, 0, ArgumentValue(type));
+    PyTuple_SET_ITEM(argsTuple, 1, ArgumentValue(value));
+    PyTuple_SET_ITEM(argsTuple, 2, ArgumentValue(traceback));
+
+    // call the format_exception method
+    result = PyObject_CallObject(method, argsTuple);
+    Py_DECREF(method);
+    Py_DECREF(argsTuple);
+    if (!result)
+        return FatalPythonErrorNoTraceback(type, value,
+                "Failed calling format_exception method.");
+
+    // determine length of string representation of formatted traceback
+    tracebackLength = 1;
+    for (i = 0; i < PyList_GET_SIZE(result); i++)
+        tracebackLength += PyString_GET_SIZE(PyList_GET_ITEM(result, i));
+
+    // create a string representation of the formatted traceback
+    tracebackStr = malloc(tracebackLength);
+    if (!tracebackStr) {
+        Py_DECREF(result);
+        return FatalError("Out of memory!");
+    }
+    tracebackStr[0] = '\0';
+    for (i = 0; i < PyList_GET_SIZE(result); i++)
+        strcat(tracebackStr, PyString_AS_STRING(PyList_GET_ITEM(result, i)));
+    Py_DECREF(result);
+
+    // bring up the error
+    MessageBox(NULL, tracebackStr, "cx_Freeze: Python error in main script",
+            MB_ICONERROR);
+    Py_Finalize();
+    return 1;
+}
+
+
+#include "Common.c"
+
+
+//-----------------------------------------------------------------------------
+// WinMain()
+//   Main routine for the executable in Windows.
+//-----------------------------------------------------------------------------
+int WINAPI WinMain(
+    HINSTANCE instance,                 // handle to application
+    HINSTANCE prevInstance,             // previous handle to application
+    LPSTR commandLine,                  // command line
+    int showFlag)                       // show flag
+{
+    const char *fileName;
+
+    // initialize Python
+    Py_NoSiteFlag = 1;
+    Py_FrozenFlag = 1;
+    Py_IgnoreEnvironmentFlag = 1;
+    Py_SetPythonHome("");
+    Py_SetProgramName(__argv[0]);
+    fileName = Py_GetProgramFullPath();
+    Py_Initialize();
+    PySys_SetArgv(__argc, __argv);
+
+    // do the work
+    if (ExecuteScript(fileName) < 0)
+        return 1;
+
+    // terminate Python
+    Py_Finalize();
+    return 0;
+}
+
diff --git a/installer/cx_Freeze/source/bases/dummy.rc b/installer/cx_Freeze/source/bases/dummy.rc
new file mode 100644
index 0000000000..5c1fa1a194
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/dummy.rc
@@ -0,0 +1,5 @@
+STRINGTABLE
+{
+    1,  "Just to ensure that buggy EndUpdateResource doesn't fall over."
+}
+
diff --git a/installer/cx_Freeze/source/bases/manifest.rc b/installer/cx_Freeze/source/bases/manifest.rc
new file mode 100644
index 0000000000..2b7ee27ab5
--- /dev/null
+++ b/installer/cx_Freeze/source/bases/manifest.rc
@@ -0,0 +1,3 @@
+#include "dummy.rc"
+
+1 24 source/bases/manifest.txt
diff --git a/installer/cx_Freeze/source/util.c b/installer/cx_Freeze/source/util.c
new file mode 100644
index 0000000000..1c8eb0c0ca
--- /dev/null
+++ b/installer/cx_Freeze/source/util.c
@@ -0,0 +1,418 @@
+//-----------------------------------------------------------------------------
+// util.c
+//   Shared library for use by cx_Freeze.
+//-----------------------------------------------------------------------------
+
+#include <Python.h>
+
+#ifdef WIN32
+#include <windows.h>
+#include <imagehlp.h>
+
+#pragma pack(2)
+
+typedef struct {
+    BYTE bWidth;                        // Width, in pixels, of the image
+    BYTE bHeight;                       // Height, in pixels, of the image
+    BYTE bColorCount;                   // Number of colors in image
+    BYTE bReserved;                     // Reserved ( must be 0)
+    WORD wPlanes;                       // Color Planes
+    WORD wBitCount;                     // Bits per pixel
+    DWORD dwBytesInRes;                 // How many bytes in this resource?
+    DWORD dwImageOffset;                // Where in the file is this image?
+} ICONDIRENTRY;
+
+typedef struct {
+    WORD idReserved;                    // Reserved (must be 0)
+    WORD idType;                        // Resource Type (1 for icons)
+    WORD idCount;                       // How many images?
+    ICONDIRENTRY idEntries[0];          // An entry for each image
+} ICONDIR;
+
+typedef struct {
+    BYTE bWidth;                        // Width, in pixels, of the image
+    BYTE bHeight;                       // Height, in pixels, of the image
+    BYTE bColorCount;                   // Number of colors in image
+    BYTE bReserved;                     // Reserved ( must be 0)
+    WORD wPlanes;                       // Color Planes
+    WORD wBitCount;                     // Bits per pixel
+    DWORD dwBytesInRes;                 // How many bytes in this resource?
+    WORD nID;                           // resource ID
+} GRPICONDIRENTRY;
+
+typedef struct {
+    WORD idReserved;                    // Reserved (must be 0)
+    WORD idType;                        // Resource Type (1 for icons)
+    WORD idCount;                       // How many images?
+    GRPICONDIRENTRY idEntries[0];       // An entry for each image
+} GRPICONDIR;
+#endif
+
+//-----------------------------------------------------------------------------
+// Globals
+//-----------------------------------------------------------------------------
+#ifdef WIN32
+static PyObject *g_BindErrorException = NULL;
+static PyObject *g_ImageNames = NULL;
+#endif
+
+
+#ifdef WIN32
+//-----------------------------------------------------------------------------
+// BindStatusRoutine()
+//   Called by BindImageEx() at various points. This is used to determine the
+// dependency tree which is later examined by cx_Freeze.
+//-----------------------------------------------------------------------------
+static BOOL __stdcall BindStatusRoutine(
+    IMAGEHLP_STATUS_REASON reason,      // reason called
+    PSTR imageName,                     // name of image being examined
+    PSTR dllName,                       // name of DLL
+    ULONG virtualAddress,               // computed virtual address
+    ULONG parameter)                    // parameter (value depends on reason)
+{
+    char fileName[MAX_PATH + 1];
+
+    switch (reason) {
+        case BindImportModule:
+            if (!SearchPath(NULL, dllName, NULL, sizeof(fileName), fileName,
+                    NULL))
+                return FALSE;
+            Py_INCREF(Py_None);
+            if (PyDict_SetItemString(g_ImageNames, fileName, Py_None) < 0)
+                return FALSE;
+            break;
+        default:
+            break;
+    }
+    return TRUE;
+}
+
+
+//-----------------------------------------------------------------------------
+// GetFileData()
+//   Return the data for the given file.
+//-----------------------------------------------------------------------------
+static int GetFileData(
+    const char *fileName,               // name of file to read
+    char **data)                        // pointer to data (OUT)
+{
+    DWORD numberOfBytesRead, dataSize;
+    HANDLE file;
+
+    file = CreateFile(fileName, GENERIC_READ, FILE_SHARE_READ, NULL,
+            OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (file == INVALID_HANDLE_VALUE)
+        return -1;
+    dataSize = GetFileSize(file, NULL);
+    if (dataSize == INVALID_FILE_SIZE) {
+        CloseHandle(file);
+        return -1;
+    }
+    *data = PyMem_Malloc(dataSize);
+    if (!*data) {
+        CloseHandle(file);
+        return -1;
+    }
+    if (!ReadFile(file, *data, dataSize, &numberOfBytesRead, NULL)) {
+        CloseHandle(file);
+        return -1;
+    }
+    CloseHandle(file);
+    return 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// CreateGroupIconResource()
+//   Return the group icon resource given the icon file data.
+//-----------------------------------------------------------------------------
+static GRPICONDIR *CreateGroupIconResource(
+    ICONDIR *iconDir,                   // icon information
+    DWORD *resourceSize)                // size of resource (OUT)
+{
+    GRPICONDIR *groupIconDir;
+    int i;
+
+    *resourceSize = sizeof(GRPICONDIR) +
+            sizeof(GRPICONDIRENTRY) * iconDir->idCount;
+    groupIconDir = PyMem_Malloc(*resourceSize);
+    if (!groupIconDir)
+        return NULL;
+    groupIconDir->idReserved = iconDir->idReserved;
+    groupIconDir->idType = iconDir->idType;
+    groupIconDir->idCount = iconDir->idCount;
+    for (i = 0; i < iconDir->idCount; i++) {
+        groupIconDir->idEntries[i].bWidth = iconDir->idEntries[i].bWidth;
+        groupIconDir->idEntries[i].bHeight = iconDir->idEntries[i].bHeight;
+        groupIconDir->idEntries[i].bColorCount =
+                iconDir->idEntries[i].bColorCount;
+        groupIconDir->idEntries[i].bReserved = iconDir->idEntries[i].bReserved;
+        groupIconDir->idEntries[i].wPlanes = iconDir->idEntries[i].wPlanes;
+        groupIconDir->idEntries[i].wBitCount = iconDir->idEntries[i].wBitCount;
+        groupIconDir->idEntries[i].dwBytesInRes =
+                iconDir->idEntries[i].dwBytesInRes;
+        groupIconDir->idEntries[i].nID = i + 1;
+    }
+
+    return groupIconDir;
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtAddIcon()
+//   Add the icon as a resource to the specified file.
+//-----------------------------------------------------------------------------
+static PyObject *ExtAddIcon(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    char *executableName, *iconName, *data, *iconData;
+    GRPICONDIR *groupIconDir;
+    DWORD resourceSize;
+    ICONDIR *iconDir;
+    BOOL succeeded;
+    HANDLE handle;
+    int i;
+
+    if (!PyArg_ParseTuple(args, "ss", &executableName, &iconName))
+        return NULL;
+
+    // begin updating the executable
+    handle = BeginUpdateResource(executableName, FALSE);
+    if (!handle) {
+        PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
+                GetLastError(), executableName);
+        return NULL;
+    }
+
+    // first attempt to get the data from the icon file
+    data = NULL;
+    succeeded = TRUE;
+    groupIconDir = NULL;
+    if (GetFileData(iconName, &data) < 0)
+        succeeded = FALSE;
+    iconDir = (ICONDIR*) data;
+
+    // next, attempt to add a group icon resource
+    if (succeeded) {
+        groupIconDir = CreateGroupIconResource(iconDir, &resourceSize);
+        if (groupIconDir)
+            succeeded = UpdateResource(handle, RT_GROUP_ICON,
+                    MAKEINTRESOURCE(1),
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL),
+                    groupIconDir, resourceSize);
+        else succeeded = FALSE;
+    }
+
+    // next, add each icon as a resource
+    if (succeeded) {
+        for (i = 0; i < iconDir->idCount; i++) {
+            iconData = &data[iconDir->idEntries[i].dwImageOffset];
+            resourceSize = iconDir->idEntries[i].dwBytesInRes;
+            succeeded = UpdateResource(handle, RT_ICON, MAKEINTRESOURCE(i + 1),
+                    MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), iconData,
+                    resourceSize);
+            if (!succeeded)
+                break;
+        }
+    }
+
+    // finish writing the resource (or discarding the changes upon an error)
+    if (!EndUpdateResource(handle, !succeeded)) {
+        if (succeeded) {
+            succeeded = FALSE;
+            PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
+                    GetLastError(), executableName);
+        }
+    }
+
+    // clean up
+    if (groupIconDir)
+        PyMem_Free(groupIconDir);
+    if (data)
+        PyMem_Free(data);
+    if (!succeeded)
+        return NULL;
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtBeginUpdateResource()
+//   Wrapper for BeginUpdateResource().
+//-----------------------------------------------------------------------------
+static PyObject *ExtBeginUpdateResource(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    BOOL deleteExistingResources;
+    char *fileName;
+    HANDLE handle;
+
+    deleteExistingResources = TRUE;
+    if (!PyArg_ParseTuple(args, "s|i", &fileName, &deleteExistingResources))
+        return NULL;
+    handle = BeginUpdateResource(fileName, deleteExistingResources);
+    if (!handle) {
+        PyErr_SetExcFromWindowsErrWithFilename(PyExc_WindowsError,
+                GetLastError(), fileName);
+        return NULL;
+    }
+    return PyInt_FromLong((long) handle);
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtUpdateResource()
+//   Wrapper for UpdateResource().
+//-----------------------------------------------------------------------------
+static PyObject *ExtUpdateResource(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    int resourceType, resourceId, resourceDataSize;
+    char *resourceData;
+    HANDLE handle;
+
+    if (!PyArg_ParseTuple(args, "iiis#", &handle, &resourceType, &resourceId,
+            &resourceData, &resourceDataSize))
+        return NULL;
+    if (!UpdateResource(handle, MAKEINTRESOURCE(resourceType),
+            MAKEINTRESOURCE(resourceId),
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_NEUTRAL), resourceData,
+            resourceDataSize)) {
+        PyErr_SetExcFromWindowsErr(PyExc_WindowsError, GetLastError());
+        return NULL;
+    }
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtEndUpdateResource()
+//   Wrapper for EndUpdateResource().
+//-----------------------------------------------------------------------------
+static PyObject *ExtEndUpdateResource(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    BOOL discardChanges;
+    HANDLE handle;
+
+    discardChanges = FALSE;
+    if (!PyArg_ParseTuple(args, "i|i", &handle, &discardChanges))
+        return NULL;
+    if (!EndUpdateResource(handle, discardChanges)) {
+        PyErr_SetExcFromWindowsErr(PyExc_WindowsError, GetLastError());
+        return NULL;
+    }
+
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtGetDependentFiles()
+//   Return a list of files that this file depends on.
+//-----------------------------------------------------------------------------
+static PyObject *ExtGetDependentFiles(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    PyObject *results;
+    char *imageName;
+
+    if (!PyArg_ParseTuple(args, "s", &imageName))
+        return NULL;
+    g_ImageNames = PyDict_New();
+    if (!g_ImageNames)
+        return NULL;
+    if (!BindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | BIND_ALL_IMAGES,
+                imageName, NULL, NULL, BindStatusRoutine)) {
+        Py_DECREF(g_ImageNames);
+        PyErr_SetExcFromWindowsErrWithFilename(g_BindErrorException,
+                GetLastError(), imageName);
+        return NULL;
+    }
+    results = PyDict_Keys(g_ImageNames);
+    Py_DECREF(g_ImageNames);
+    return results;
+}
+
+
+//-----------------------------------------------------------------------------
+// ExtGetSystemDir()
+//   Return the Windows directory (C:\Windows for example).
+//-----------------------------------------------------------------------------
+static PyObject *ExtGetSystemDir(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments (ignored)
+{
+    char dir[MAX_PATH + 1];
+
+    if (GetSystemDirectory(dir, sizeof(dir)))
+        return PyString_FromString(dir);
+    PyErr_SetExcFromWindowsErr(PyExc_RuntimeError, GetLastError());
+    return NULL;
+}
+#endif
+
+
+//-----------------------------------------------------------------------------
+// ExtSetOptimizeFlag()
+//   Set the optimize flag as needed.
+//-----------------------------------------------------------------------------
+static PyObject *ExtSetOptimizeFlag(
+    PyObject *self,                     // passthrough argument
+    PyObject *args)                     // arguments
+{
+    if (!PyArg_ParseTuple(args, "i", &Py_OptimizeFlag))
+        return NULL;
+    Py_INCREF(Py_None);
+    return Py_None;
+}
+
+
+//-----------------------------------------------------------------------------
+// Methods
+//-----------------------------------------------------------------------------
+static PyMethodDef g_ModuleMethods[] = {
+    { "SetOptimizeFlag", ExtSetOptimizeFlag, METH_VARARGS },
+#ifdef WIN32
+    { "BeginUpdateResource", ExtBeginUpdateResource, METH_VARARGS },
+    { "UpdateResource", ExtUpdateResource, METH_VARARGS },
+    { "EndUpdateResource", ExtEndUpdateResource, METH_VARARGS },
+    { "AddIcon", ExtAddIcon, METH_VARARGS },
+    { "GetDependentFiles", ExtGetDependentFiles, METH_VARARGS },
+    { "GetSystemDir", ExtGetSystemDir, METH_NOARGS },
+#endif
+    { NULL }
+};
+
+
+//-----------------------------------------------------------------------------
+// initutil()
+//   Initialization routine for the shared libary.
+//-----------------------------------------------------------------------------
+void initutil(void)
+{
+    PyObject *module;
+
+    module = Py_InitModule("cx_Freeze.util", g_ModuleMethods);
+    if (!module)
+        return;
+#ifdef WIN32
+    g_BindErrorException = PyErr_NewException("cx_Freeze.util.BindError",
+            NULL, NULL);
+    if (!g_BindErrorException)
+        return;
+    if (PyModule_AddObject(module, "BindError", g_BindErrorException) < 0)
+        return;
+#endif
+}
+
diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py
index ca11e8d5c4..32581abee2 100644
--- a/installer/linux/freeze.py
+++ b/installer/linux/freeze.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env  python
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
@@ -6,162 +7,216 @@ __docformat__ = 'restructuredtext en'
 '''
 Create linux binary.
 '''
-import glob, sys, subprocess, tarfile, os, re, py_compile, shutil
-HOME           = '/home/kovid'
-PYINSTALLER    = os.path.expanduser('~/build/pyinstaller')
-CALIBREPREFIX  = '___'
-PDFTOHTML      = '/usr/bin/pdftohtml'
-LIBUNRAR       = '/usr/lib/libunrar.so'
-QTDIR          = '/usr/lib/qt4'
-QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit')
-EXTRAS         = ('/usr/lib/python2.5/site-packages/PIL', os.path.expanduser('~/ipython/IPython'))
-SQLITE         = '/usr/lib/libsqlite3.so.0'
-DBUS           = '/usr/lib/libdbus-1.so.3'
-LIBMNG         = '/usr/lib/libmng.so.1'
-LIBZ           = '/lib/libz.so.1'
-LIBBZ2         = '/lib/libbz2.so.1'
-LIBUSB         = '/usr/lib/libusb.so'
-LIBPOPPLER     = '/usr/lib/libpoppler.so.3'
-LIBXML2        = '/usr/lib/libxml2.so.2'
-LIBXSLT        = '/usr/lib/libxslt.so.1'
-LIBEXSLT       = '/usr/lib/libexslt.so.0'
 
+def freeze():
+    import glob, sys, subprocess, tarfile, os, re, textwrap, shutil, cStringIO, bz2, codecs
+    from contextlib import closing
+    from cx_Freeze import Executable, setup
+    from calibre.constants import __version__, __appname__
+    from calibre.linux import entry_points
+    from calibre import walk
+    from calibre.web.feeds.recipes import recipe_modules
+    import calibre
+    
 
-CALIBRESRC     = os.path.join(CALIBREPREFIX, 'src')
-CALIBREPLUGINS = os.path.join(CALIBRESRC, 'calibre', 'plugins')
+    QTDIR          = '/usr/lib/qt4'
+    QTDLLS         = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit')
+    
+    binary_excludes = ['libGLcore*', 'libGL*', 'libnvidia*']
+    
+    binary_includes = [
+                       '/usr/bin/pdftohtml',
+                       '/usr/lib/libunrar.so',
+                       '/usr/lib/libsqlite3.so.0',
+                       '/usr/lib/libsqlite3.so.0',
+                       '/usr/lib/libmng.so.1',
+                       '/lib/libz.so.1',
+                       '/lib/libbz2.so.1',
+                       '/lib/libbz2.so.1',
+                       '/usr/lib/libpoppler.so.4',
+                       '/usr/lib/libxml2.so.2',
+                       '/usr/lib/libxslt.so.1',
+                       '/usr/lib/libxslt.so.1',
+                       '/usr/lib/libMagickWand.so',
+                       '/usr/lib/libMagickCore.so',
+                       ]
+    
+    binary_includes += [os.path.join(QTDIR, 'lib%s.so.4'%x) for x in QTDLLS]
+    
+    
+    d = os.path.dirname
+    CALIBRESRC = d(d(d(os.path.abspath(calibre.__file__))))
+    CALIBREPLUGINS = os.path.join(CALIBRESRC, 'src', 'calibre', 'plugins')
+    FREEZE_DIR = os.path.join(CALIBRESRC, 'build', 'cx_freeze')
+    DIST_DIR   = os.path.join(CALIBRESRC, 'dist')
+    
+    os.chdir(CALIBRESRC)
+    
+    print 'Freezing calibre located at', CALIBRESRC
+    
+    sys.path.insert(0, os.path.join(CALIBRESRC, 'src'))
+    
+    entry_points = entry_points['console_scripts'] + entry_points['gui_scripts']
+    entry_points = ['calibre_postinstall=calibre.linux:binary_install', 
+                    'calibre-parallel=calibre.parallel:main'] + entry_points
+    executables = {}
+    for ep in entry_points:
+        executables[ep.split('=')[0].strip()] = (ep.split('=')[1].split(':')[0].strip(),
+                                                 ep.split(':')[-1].strip())
+    
+    if os.path.exists(FREEZE_DIR):
+        shutil.rmtree(FREEZE_DIR)
+    os.makedirs(FREEZE_DIR)
+    
+    if not os.path.exists(DIST_DIR):
+        os.makedirs(DIST_DIR)
+    
+    includes = [x[0] for x in executables.values()]
+    
+    excludes = ['matplotlib', "Tkconstants", "Tkinter", "tcl", "_imagingtk", 
+                "ImageTk", "FixTk", 'wx', 'PyQt4.QtAssistant', 'PyQt4.QtOpenGL.so', 
+                'PyQt4.QtScript.so', 'PyQt4.QtSql.so', 'PyQt4.QtTest.so', 'qt',
+                'glib', 'gobject']
+    
+    packages = ['calibre', 'encodings', 'cherrypy', 'cssutils', 'xdg']
+    
+    includes += ['calibre.web.feeds.recipes.'+r for r in recipe_modules]
+    
+    LOADER = '/tmp/loader.py'
+    open(LOADER, 'wb').write('# This script is never actually used.\nimport sys')
+    
+    INIT_SCRIPT = '/tmp/init.py'
+    open(INIT_SCRIPT, 'wb').write(textwrap.dedent('''
+    ## Load calibre module specified in the environment variable CALIBRE_CX_EXE
+    ## Also restrict sys.path to the executables' directory and add the
+    ## executables directory to LD_LIBRARY_PATH 
+    import encodings
+    import os
+    import sys
+    import warnings
+    import zipimport
+    import locale
+    import codecs
+    
+    enc = locale.getdefaultlocale()[1]
+    if not enc:
+        enc = locale.nl_langinfo(locale.CODESET)
+    enc = codecs.lookup(enc if enc else 'UTF-8').name
+    sys.setdefaultencoding(enc)
+    
+    paths = os.environ.get('LD_LIBRARY_PATH', '').split(os.pathsep)
+    if DIR_NAME not in paths or not sys.getfilesystemencoding():
+        paths.insert(0, DIR_NAME)
+        os.environ['LD_LIBRARY_PATH'] = os.pathsep.join(paths)
+        os.environ['PYTHONIOENCODING'] = enc
+        os.execv(sys.executable, sys.argv)
+    
+    sys.path = sys.path[:3]
+    sys.frozen = True
+    sys.frozen_path = DIR_NAME
+    
+    executables = %(executables)s
+    
+    exe = os.environ.get('CALIBRE_CX_EXE', False)
+    ret = 1
+    if not exe:
+        print >>sys.stderr, 'Invalid invocation of calibre loader. CALIBRE_CX_EXE not set'
+    elif exe not in executables:
+        print >>sys.stderr, 'Invalid invocation of calibre loader. CALIBRE_CX_EXE=%%s is unknown'%%exe
+    else:
+        from PyQt4.QtCore import QCoreApplication
+        QCoreApplication.setLibraryPaths([sys.frozen_path, os.path.join(sys.frozen_path, "qtplugins")])
+        sys.argv[0] = exe
+        module, func = executables[exe]
+        module = __import__(module, fromlist=[1])
+        func = getattr(module, func)
+        ret = func()
+    
+    module = sys.modules.get("threading")
+    if module is not None:
+        module._shutdown()
+    sys.exit(ret)
+    ''')%dict(executables=repr(executables)))
+    sys.argv = ['freeze', 'build_exe']
+    setup(
+          name        = __appname__,
+          version     = __version__,
+          executables = [Executable(script=LOADER, targetName='loader', compress=False)],
+          options     = { 'build_exe' :
+                         {
+                          'build_exe'       : os.path.join(CALIBRESRC, 'build/cx_freeze'),
+                          'optimize'        : 2,
+                          'excludes'        : excludes,
+                          'includes'        : includes,
+                          'packages'        : packages,
+                          'init_script'     : INIT_SCRIPT,
+                          'copy_dependent_files' : True,
+                          'create_shared_zip'    : False,
+                          } 
+                         }
+          )
+    
+    def copy_binary(src, dest_dir):
+        dest = os.path.join(dest_dir, os.path.basename(src))
+        if not os.path.exists(dest_dir):
+            os.makedirs(dest_dir)
+        shutil.copyfile(os.path.realpath(src), dest)
+        shutil.copymode(os.path.realpath(src), dest)
+    
+    for f in binary_includes:
+        copy_binary(f, FREEZE_DIR)
+    
+    for pat in binary_excludes:
+        matches = glob.glob(os.path.join(FREEZE_DIR, pat))
+        for f in matches:
+            os.remove(f)
+            
+    print 'Adding calibre plugins...'
+    os.makedirs(os.path.join(FREEZE_DIR, 'plugins'))    
+    for f in glob.glob(os.path.join(CALIBREPLUGINS, '*.so')):
+        copy_binary(f, os.path.join(FREEZE_DIR, 'plugins'))
+        
+    print 'Adding Qt plugins...'
+    plugdir = os.path.join(QTDIR, 'plugins')
+    for dirpath, dirnames, filenames in os.walk(plugdir):
+        for f in filenames:
+            if not f.endswith('.so') or 'designer' in dirpath or 'codecs' in dirpath or 'sqldrivers' in dirpath: 
+                continue
+            f = os.path.join(dirpath, f)
+            dest_dir = dirpath.replace(plugdir, os.path.join(FREEZE_DIR, 'qtplugins'))
+            copy_binary(f, dest_dir)
 
-sys.path.insert(0, CALIBRESRC)
-from calibre import __version__
-from calibre.parallel import PARALLEL_FUNCS
-from calibre.web.feeds.recipes import recipes
-hiddenimports = list(map(lambda x: x[0], PARALLEL_FUNCS.values()))
-hiddenimports += ['PyQt4.QtWebKit']
-hiddenimports += ['lxml._elementpath', 'keyword', 'codeop', 'commands', 'shlex', 'pydoc']
-hiddenimports += map(lambda x: x.__module__, recipes)
-open(os.path.join(PYINSTALLER, 'hooks', 'hook-calibre.parallel.py'), 'wb').write('hiddenimports = %s'%repr(hiddenimports))
-
-def run_pyinstaller(args=sys.argv):
-    subprocess.check_call(('/usr/bin/sudo', 'chown', '-R', 'kovid:users', glob.glob('/usr/lib/python*/site-packages/')[-1]))
-    subprocess.check_call('rm -rf %(py)s/dist/* %(py)s/build/*'%dict(py=PYINSTALLER), shell=True)
-    cp = HOME+'/build/'+os.path.basename(os.getcwd())
-    spec = open(os.path.join(PYINSTALLER, 'calibre', 'calibre.spec'), 'wb')
-    raw = re.sub(r'CALIBREPREFIX\s+=\s+\'___\'', 'CALIBREPREFIX = '+repr(cp),
-                 open(__file__).read())
-    spec.write(raw)
-    spec.close()
-    os.chdir(PYINSTALLER)
-    shutil.rmtree('calibre/dist')
-    os.mkdir('calibre/dist')
-    subprocess.check_call('python -OO Build.py calibre/calibre.spec', shell=True)
-                
+    print 'Creating launchers'
+    for exe in executables:
+        path = os.path.join(FREEZE_DIR, exe) 
+        open(path, 'wb').write(textwrap.dedent('''\
+        #!/bin/sh
+        export CALIBRE_CX_EXE=%s
+        path=`readlink -e $0`
+        base=`dirname $path`
+        loader=$base/loader
+        export LD_LIBRARY_PATH=$base:$LD_LIBRARY_PATH
+        $loader "$@"
+        ''')%exe)
+        os.chmod(path, 0755)
+    
+    exes = list(executables.keys())
+    exes.remove('calibre_postinstall')
+    exes.remove('calibre-parallel')
+    open(os.path.join(FREEZE_DIR, 'manifest'), 'wb').write('\n'.join(exes))
+            
+    print 'Creating archive...'
+    dist = open(os.path.join(DIST_DIR, 'calibre-%s-i686.tar.bz2'%__version__), 'wb')
+    with closing(tarfile.open(fileobj=dist, mode='w:bz2', 
+                              format=tarfile.PAX_FORMAT)) as tf:
+        for f in walk(FREEZE_DIR):
+            name = f.replace(FREEZE_DIR, '')[1:]
+            if name:
+                tf.add(f, name)
+    dist.flush()
+    dist.seek(0, 2)
+    print 'Archive %s created: %.2f MB'%(dist.name, dist.tell()/(1024.**2))
     return 0
 
-
-if __name__ == '__main__' and 'freeze.py' in __file__:
-    sys.exit(run_pyinstaller())
-
-
-loader = os.path.join(os.path.expanduser('~/temp'), 'calibre_installer_loader.py')
-if not os.path.exists(loader):
-    open(loader, 'wb').write('''
-import sys, os
-sys.frozen_path = os.getcwd()
-os.chdir(os.environ.get("ORIGWD", "."))
-sys.path.insert(0, os.path.join(sys.frozen_path, "library.pyz"))
-sys.path.insert(0, sys.frozen_path)
-from PyQt4.QtCore import QCoreApplication
-QCoreApplication.setLibraryPaths([sys.frozen_path, os.path.join(sys.frozen_path, "qtplugins")])
-''')
-excludes = ['gtk._gtk', 'gtk.glade', 'qt', 'matplotlib.nxutils', 'matplotlib._cntr',
-            'matplotlib.ttconv', 'matplotlib._image', 'matplotlib.ft2font',
-            'matplotlib._transforms', 'matplotlib._agg', 'matplotlib.backends._backend_agg',
-            'matplotlib.axes', 'matplotlib', 'matplotlib.pyparsing',
-            'TKinter', 'atk', 'gobject._gobject', 'pango', 'PIL', 'Image', 'IPython']
-
-
-sys.path.insert(0, CALIBRESRC)
-from calibre.linux import entry_points
-
-executables, scripts = ['calibre_postinstall', 'calibre-parallel'], \
-                       [os.path.join(CALIBRESRC, 'calibre', 'linux.py'), os.path.join(CALIBRESRC, 'calibre', 'parallel.py')]
-
-for entry in entry_points['console_scripts'] + entry_points['gui_scripts']:
-    fields = entry.split('=')
-    executables.append(fields[0].strip())
-    scripts.append(os.path.join(CALIBRESRC, *map(lambda x: x.strip(), fields[1].split(':')[0].split('.')))+'.py')
-
-analyses = [Analysis([os.path.join(HOMEPATH,'support/_mountzlib.py'), os.path.join(HOMEPATH,'support/useUnicode.py'), loader, script],
-             pathex=[PYINSTALLER, CALIBRESRC], excludes=excludes) for script in scripts]
-
-pyz = TOC()
-binaries = TOC()
-
-for a in analyses:
-    pyz = a.pure + pyz
-    binaries = a.binaries + binaries
-pyz = PYZ(pyz, name='library.pyz')
-
-built_executables = []
-for script, exe, a in zip(scripts, executables, analyses):
-    built_executables.append(EXE(PYZ(TOC()),
-    a.scripts+[('O','','OPTION'),],
-    exclude_binaries=1,
-    name=os.path.join('buildcalibre', exe),
-    debug=False,
-    strip=True,
-    upx=False,
-    excludes=excludes,
-    console=1))
-
-print 'Adding plugins...'
-for f in glob.glob(os.path.join(CALIBREPLUGINS, '*.so')):
-    binaries += [('plugins/'+os.path.basename(f), f, 'BINARY')]
-for f in glob.glob(os.path.join(CALIBREPLUGINS, '*.so.*')):
-    binaries += [(os.path.basename(f), f, 'BINARY')]
-
-print 'Adding external programs...'
-binaries += [('pdftohtml', PDFTOHTML, 'BINARY'),
-             ('libunrar.so', LIBUNRAR, 'BINARY')]
-
-print 'Adding external libraries...'
-binaries += [ (os.path.basename(x), x, 'BINARY') for x in (SQLITE, DBUS,
-            LIBMNG, LIBZ, LIBBZ2, LIBUSB, LIBPOPPLER, LIBXML2, LIBXSLT, LIBEXSLT)]
-             
-
-qt = []
-for dll in QTDLLS:
-    path = os.path.join(QTDIR, 'lib'+dll+'.so.4')
-    qt.append((os.path.basename(path), path, 'BINARY'))
-binaries += qt
-
-plugins = []
-plugdir = os.path.join(QTDIR, 'plugins')
-for dirpath, dirnames, filenames in os.walk(plugdir):
-    for f in filenames:
-        if not f.endswith('.so') or 'designer' in dirpath or 'codcs' in dirpath or 'sqldrivers' in dirpath : continue
-        f = os.path.join(dirpath, f)
-        plugins.append(('qtplugins/'+f.replace(plugdir, ''), f, 'BINARY'))
-binaries += plugins
-
-manifest = '/tmp/manifest'
-open(manifest, 'wb').write('\n'.join(executables))
-version = '/tmp/version'
-open(version, 'wb').write(__version__)
-coll = COLLECT(binaries, pyz, 
-               [('manifest', manifest, 'DATA'), ('version', version, 'DATA')],
-               *built_executables,
-               **dict(strip=True,
-               upx=False,
-               excludes=excludes,
-               name='dist'))
-
-os.chdir(os.path.join(HOMEPATH, 'calibre', 'dist'))
-for folder in EXTRAS:
-    subprocess.check_call('cp -rf %s .'%folder, shell=True)
-
-print 'Building tarball...'
-tbz2 = 'calibre-%s-i686.tar.bz2'%__version__
-tf = tarfile.open(os.path.join('/tmp', tbz2), 'w:bz2')
-
-for f in os.listdir('.'):
-    tf.add(f)
+if __name__ == '__main__':
+    freeze()
diff --git a/installer/osx/freeze.py b/installer/osx/freeze.py
index f40c280570..2a74d15802 100644
--- a/installer/osx/freeze.py
+++ b/installer/osx/freeze.py
@@ -177,7 +177,7 @@ _check_symlinks_prescript()
     
     def fix_python_dependencies(self, files):
         for f in files:
-            subprocess.check_call(['/usr/bin/install_name_tool', '-change', '/Library/Frameworks/Python.framework/Versions/2.5/Python', '@executable_path/../Frameworks/Python.framework/Versions/2.5/Python', f])
+            subprocess.check_call(['/usr/bin/install_name_tool', '-change', '/Library/Frameworks/Python.framework/Versions/2.6/Python', '@executable_path/../Frameworks/Python.framework/Versions/2.6/Python', f])
             
     def fix_misc_dependencies(self, files):
         for path in files:
@@ -247,10 +247,13 @@ _check_symlinks_prescript()
         print 'Adding pdftohtml'
         os.link(os.path.expanduser('~/pdftohtml'), os.path.join(frameworks_dir, 'pdftohtml'))
         print 'Adding plugins'
-        module_dir = os.path.join(resource_dir, 'lib', 'python2.5', 'lib-dynload')
+        module_dir = os.path.join(resource_dir, 'lib', 'python2.6', 'lib-dynload')
         print 'Adding fontconfig'
         for f in glob.glob(os.path.expanduser('~/fontconfig-bundled/*')):
-            os.link(f, os.path.join(frameworks_dir, os.path.basename(f)))
+            dest = os.path.join(frameworks_dir, os.path.basename(f))
+            if os.path.exists(dest):
+                os.remove(dest)
+            os.link(f, dest)
         dst = os.path.join(resource_dir, 'fonts')
         if os.path.exists(dst):
             shutil.rmtree(dst)
@@ -258,7 +261,7 @@ _check_symlinks_prescript()
         
         print
         print 'Adding IPython'
-        dst = os.path.join(resource_dir, 'lib', 'python2.5', 'IPython')
+        dst = os.path.join(resource_dir, 'lib', 'python2.6', 'IPython')
         if os.path.exists(dst): shutil.rmtree(dst)
         shutil.copytree(os.path.expanduser('~/build/ipython/IPython'), dst)
         
@@ -280,6 +283,7 @@ _check_symlinks_prescript()
         f = open(launcher_path, 'r')
         src = f.read()
         f.close()
+        src = src.replace('import Image', 'from PIL import Image')
         src = re.sub('(_run\s*\(.*?.py.*?\))', cs+'%s'%(
 '''
 sys.frameworks_dir = os.path.join(os.path.dirname(os.environ['RESOURCEPATH']), 'Frameworks')
@@ -290,7 +294,7 @@ sys.frameworks_dir = os.path.join(os.path.dirname(os.environ['RESOURCEPATH']), '
         f.close()
         print 
         print 'Adding main scripts to site-packages'
-        f = zipfile.ZipFile(os.path.join(self.dist_dir, APPNAME+'.app', 'Contents', 'Resources', 'lib', 'python2.5', 'site-packages.zip'), 'a', zipfile.ZIP_DEFLATED)
+        f = zipfile.ZipFile(os.path.join(self.dist_dir, APPNAME+'.app', 'Contents', 'Resources', 'lib', 'python2.6', 'site-packages.zip'), 'a', zipfile.ZIP_DEFLATED)
         for script in scripts['gui']+scripts['console']:
             f.write(script, script.partition('/')[-1])
         f.close()
@@ -322,7 +326,8 @@ def main():
                                        'genshi', 'calibre.web.feeds.recipes.*',
                                        'calibre.ebooks.lrf.any.*', 'calibre.ebooks.lrf.feeds.*',
                                        'keyword', 'codeop', 'pydoc', 'readline',
-                                       'BeautifulSoup'],
+                                       'BeautifulSoup'
+                                       ],
                          'packages' : ['PIL', 'Authorization', 'lxml'],
                          'excludes' : ['IPython'],
                          'plist'    : { 'CFBundleGetInfoString' : '''calibre, an E-book management application.'''
diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py
index 007217803e..73bb9cae56 100644
--- a/installer/windows/freeze.py
+++ b/installer/windows/freeze.py
@@ -6,13 +6,13 @@ __docformat__ = 'restructuredtext en'
 '''
 Freeze app into executable using py2exe.
 '''
-QT_DIR           = 'C:\\Qt\\4.4.1'
+QT_DIR           = 'C:\\Qt\\4.4.3'
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
 PDFTOHTML        = 'C:\\pdftohtml\\pdftohtml.exe'
 IMAGEMAGICK_DIR  = 'C:\\ImageMagick'
 FONTCONFIG_DIR   = 'C:\\fontconfig'
-
+VC90             = r'C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT'
 
 import sys, os, py2exe, shutil, zipfile, glob, subprocess, re
 from distutils.core import setup
@@ -65,6 +65,8 @@ class BuildEXE(py2exe.build_exe.py2exe):
             shutil.copyfile(f, os.path.join(self.dist_dir, os.path.basename(f)))
         for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.pyd')):
             shutil.copyfile(f, os.path.join(tgt, os.path.basename(f)))
+        for f in glob.glob(os.path.join(BASE_DIR, 'src', 'calibre', 'plugins', '*.manifest')):
+            shutil.copyfile(f, os.path.join(tgt, os.path.basename(f)))
         shutil.copyfile('LICENSE', os.path.join(self.dist_dir, 'LICENSE'))
         print
         print 'Adding QtXml4.dll'
@@ -115,12 +117,17 @@ class BuildEXE(py2exe.build_exe.py2exe):
                 shutil.copytree(f, tgt)
             else:
                 shutil.copyfile(f, tgt)
-        
+                
         print 
         print 'Doing DLL redirection' # See http://msdn.microsoft.com/en-us/library/ms682600(VS.85).aspx
         for f in glob.glob(os.path.join(PY2EXE_DIR, '*.exe')):
             open(f + '.local', 'w').write('\n')
         
+        print
+        print 'Adding Windows runtime dependencies...'
+        for f in glob.glob(os.path.join(VC90, '*')):
+            shutil.copyfile(f, os.path.join(PY2EXE_DIR, os.path.basename(f)))
+        
         
     @classmethod
     def manifest(cls, prog):
@@ -142,17 +149,17 @@ def main(args=sys.argv):
                      {'script'          : scripts['gui'][0],
                       'dest_base'       : APPNAME,
                       'icon_resources'  : [(1, ICONS[0])],
-                      'other_resources' : [BuildEXE.manifest(APPNAME)],
+                      #'other_resources' : [BuildEXE.manifest(APPNAME)],
                       },
                       {'script'         : scripts['gui'][1],
                       'dest_base'       : 'lrfviewer',
                       'icon_resources'  : [(1, ICONS[1])],
-                      'other_resources' : [BuildEXE.manifest('lrfviewer')],
+                      #'other_resources' : [BuildEXE.manifest('lrfviewer')],
                       },
                       {'script'         : scripts['gui'][2],
                       'dest_base'       : 'ebook-viewer',
                       'icon_resources'  : [(1, ICONS[1])],
-                      'other_resources' : [BuildEXE.manifest('ebook-viewer')],
+                      #'other_resources' : [BuildEXE.manifest('ebook-viewer')],
                       },
                       ],
           console = console,
@@ -162,12 +169,12 @@ def main(args=sys.argv):
                                   'includes'  : [
                                              'sip', 'pkg_resources', 'PyQt4.QtSvg',
                                              'mechanize', 'ClientForm', 'wmi',
-                                             'win32file', 'pythoncom', 'rtf2xml',
+                                             'win32file', 'pythoncom', 
                                              'win32process', 'win32api', 'msvcrt',
                                              'win32event', 'calibre.ebooks.lrf.any.*',
                                              'calibre.ebooks.lrf.feeds.*',
-                                             'genshi', 'BeautifulSoup',
-                                             'path', 'pydoc', 'IPython.Extensions.*',
+                                             'BeautifulSoup', 'pyreadline',
+                                             'pydoc', 'IPython.Extensions.*',
                                              'calibre.web.feeds.recipes.*',
                                              'PyQt4.QtWebKit', 'PyQt4.QtNetwork',
                                              ],
diff --git a/pyqtdistutils.py b/pyqtdistutils.py
index 252968fb60..0e53aaabfe 100644
--- a/pyqtdistutils.py
+++ b/pyqtdistutils.py
@@ -6,7 +6,7 @@ __docformat__ = 'restructuredtext en'
 '''
 Build PyQt extensions. Integrates with distutils (but uses the PyQt build system).
 '''
-from distutils.core import Extension
+from distutils.core import Extension as _Extension
 from distutils.command.build_ext import build_ext as _build_ext
 from distutils.dep_util import newer_group
 from distutils import log
@@ -15,12 +15,23 @@ import sipconfig, os, sys, string, glob, shutil
 from PyQt4 import pyqtconfig
 iswindows = 'win32' in sys.platform
 QMAKE = os.path.expanduser('~/qt/bin/qmake') if 'darwin' in sys.platform else'qmake'
-WINDOWS_PYTHON = ['C:/Python25/libs']
+WINDOWS_PYTHON = ['C:/Python26/libs']
 OSX_SDK = '/Developer/SDKs/MacOSX10.4u.sdk'
 
 def replace_suffix(path, new_suffix):
     return os.path.splitext(path)[0] + new_suffix
 
+class Extension(_Extension):
+    pass
+
+if iswindows:
+    from distutils import msvc9compiler
+    msvc = msvc9compiler.MSVCCompiler()
+    msvc.initialize()
+    nmake = msvc.find_exe('nmake.exe')
+    rc = msvc.find_exe('rc.exe')
+
+
 class PyQtExtension(Extension):
 
     def __init__(self, name, sources, sip_sources, **kw):
@@ -37,9 +48,7 @@ class PyQtExtension(Extension):
 class build_ext(_build_ext):
 
     def make(self, makefile):
-        make = 'make'
-        if iswindows:
-            make = 'mingw32-make'
+        make = nmake if iswindows else 'make'
         self.spawn([make, '-f', makefile])
 
     def build_qt_objects(self, ext, bdir):
@@ -65,12 +74,13 @@ CONFIG   += x86 ppc
             open(name+'.pro', 'wb').write(pro)
             self.spawn([QMAKE, '-o', 'Makefile.qt', name+'.pro'])
             self.make('Makefile.qt')
-            pat = 'release\\*.o' if iswindows else '*.o'
+            pat = 'release\\*.obj' if iswindows else '*.o'
             return map(os.path.abspath, glob.glob(pat))
         finally:
             os.chdir(cwd)
 
     def build_sbf(self, sip, sbf, bdir):
+        print '\tBuilding spf...'
         sip_bin = self.sipcfg.sip_bin
         self.spawn([sip_bin,
                     "-c", bdir,
@@ -100,9 +110,7 @@ CONFIG   += x86 ppc
 
     def build_extension(self, ext):
         self.inplace = True # Causes extensions to be built in the source tree
-        if not isinstance(ext, PyQtExtension):
-            return _build_ext.build_extension(self, ext)
-
+        
         fullname = self.get_ext_fullname(ext.name)
         if self.inplace:
             # ignore build-lib -- put the compiled extension into
@@ -119,7 +127,38 @@ CONFIG   += x86 ppc
         else:
             ext_filename = os.path.join(self.build_lib,
                                         self.get_ext_filename(fullname))
-        bdir = os.path.abspath(os.path.join(self.build_temp, fullname))
+        bdir = os.path.abspath(os.path.join(self.build_temp, fullname))    
+        if not os.path.exists(bdir):
+            os.makedirs(bdir)
+            
+        if not isinstance(ext, PyQtExtension):
+            if not iswindows:
+                return _build_ext.build_extension(self, ext)
+            
+            c_sources = [f for f in ext.sources if os.path.splitext(f)[1].lower() in ('.c', '.cpp', '.cxx')]
+            compile_args = '/c /nologo /Ox /MD /W3 /GX /DNDEBUG'.split()
+            compile_args += ext.extra_compile_args
+            self.swig_opts = ''
+            inc_dirs = self.include_dirs + [x.replace('/', '\\') for x in ext.include_dirs]
+            cc = [msvc.cc] + compile_args + ['-I%s'%x for x in list(set(inc_dirs))]
+            objects = []
+            for f in c_sources:
+                o = os.path.join(bdir, os.path.basename(f)+'.obj')
+                objects.append(o)
+                compiler =  cc + ['/Tc'+f, '/Fo'+o]
+                self.spawn(compiler)
+            out = os.path.join(bdir, base+'.pyd') 
+            linker = [msvc.linker] + '/DLL /nologo /INCREMENTAL:NO'.split()
+            linker += ['/LIBPATH:'+x for x in self.library_dirs]
+            linker += [x+'.lib' for x in ext.libraries]
+            linker += ['/EXPORT:init'+base] + objects + ['/OUT:'+out]
+            self.spawn(linker)
+            for src in (out, out+'.manifest'):
+                shutil.copyfile(src, os.path.join('src', 'calibre', 'plugins', os.path.basename(src)))
+            return
+                
+        
+        
         if not os.path.exists(bdir):
             os.makedirs(bdir)
         ext.sources2 = map(os.path.abspath, ext.sources)
diff --git a/setup.py b/setup.py
index 37d54c4317..5111d16c45 100644
--- a/setup.py
+++ b/setup.py
@@ -46,10 +46,11 @@ main_functions = {
                }
 
 if __name__ == '__main__':
-    from setuptools import setup, find_packages, Extension
+    from setuptools import setup, find_packages
+    from setuptools.command.build_py import build_py as _build_py, convert_path
     from distutils.command.build import build as _build
     from distutils.core import Command as _Command
-    from pyqtdistutils import PyQtExtension, build_ext
+    from pyqtdistutils import PyQtExtension, build_ext, Extension
     import subprocess, glob
     
     def newer(targets, sources):
@@ -65,6 +66,25 @@ if __name__ == '__main__':
         newest_source, oldest_target = max(stimes), min(ttimes)
         return newest_source > oldest_target
     
+    class build_py(_build_py):
+        
+        def find_data_files(self, package, src_dir):
+            """
+            Return filenames for package's data files in 'src_dir'
+            Modified to treat data file specs as paths not globs
+            """
+            globs = (self.package_data.get('', [])
+                     + self.package_data.get(package, []))
+            files = self.manifest_files.get(package, [])[:]
+            for pattern in globs:
+                # Each pattern has to be converted to a platform-specific path
+                pattern = os.path.join(src_dir, convert_path(pattern))
+                next = glob.glob(pattern)
+                files.extend(next if next else [pattern])
+                
+            return self.exclude_data_files(package, src_dir, files)
+
+    
     class Command(_Command):
         user_options = []
         def initialize_options(self): pass
@@ -146,6 +166,7 @@ if __name__ == '__main__':
             metadata_sqlite = 'library/metadata_sqlite.sql',
             jquery          = 'gui2/viewer/jquery.js',
             jquery_scrollTo = 'gui2/viewer/jquery_scrollTo.js',
+            html_css        = 'ebooks/lit/html.css',
         )
         
         DEST = os.path.join('src', APPNAME, 'resources.py')
@@ -251,6 +272,7 @@ if __name__ == '__main__':
         description='''Compile all GUI forms and images'''
         PATH  = os.path.join('src', APPNAME, 'gui2')
         IMAGES_DEST = os.path.join(PATH, 'images_rc.py')
+        QRC = os.path.join(PATH, 'images.qrc')
         
         @classmethod
         def find_forms(cls):
@@ -330,9 +352,9 @@ if __name__ == '__main__':
                 c = cls.form_to_compiled_form(form)
                 if os.path.exists(c):
                     os.remove(c)
-            images = cls.IMAGES_DEST
-            if os.path.exists(images):
-                os.remove(images)
+            for x in (cls.IMAGES_DEST, cls.QRC):
+                if os.path.exists(x):
+                    os.remove(x)
     
     class clean(Command):
         description='''Delete all computer generated files in the source tree'''
@@ -348,32 +370,34 @@ if __name__ == '__main__':
                 os.remove(f)
             for root, dirs, files in os.walk('.'):
                 for name in files:
-                    if name.endswith('~') or \
-                       name.endswith('.pyc') or \
-                       name.endswith('.pyo'):
-                        os.remove(os.path.join(root, name))
+                    for t in ('.pyc', '.pyo', '~'):
+                        if name.endswith(t):
+                            os.remove(os.path.join(root, name))
+                            break
                         
-            for dir in 'build', 'dist':
-                for f in os.listdir(dir):
-                    if os.path.isdir(dir + os.sep + f):
-                        shutil.rmtree(dir + os.sep + f)
-                    else:
-                        os.remove(dir + os.sep + f)
+            for dir in ('build', 'dist', os.path.join('src', 'calibre.egg-info')):
+                shutil.rmtree(dir, ignore_errors=True)
     
     class build(_build):
         
-        sub_commands = \
-                        [
+        sub_commands = [
                          ('resources',    lambda self : 'CALIBRE_BUILDBOT' not in os.environ.keys()),
                          ('translations', lambda self : 'CALIBRE_BUILDBOT' not in os.environ.keys()),
                          ('gui',          lambda self : 'CALIBRE_BUILDBOT' not in os.environ.keys()),
-                         ] + _build.sub_commands
-    
+                         ('build_ext',    lambda self: True),
+                         ('build_py',     lambda self: True),
+                         ('build_clib',    _build.has_c_libraries),
+                         ('build_scripts', _build.has_scripts),
+                       ]
+        
     entry_points['console_scripts'].append('calibre_postinstall = calibre.linux:post_install')
     ext_modules = [
                    Extension('calibre.plugins.lzx',
                              sources=['src/calibre/utils/lzx/lzxmodule.c',
-                                      'src/calibre/utils/lzx/lzxd.c'],
+                                      'src/calibre/utils/lzx/compressor.c',
+                                      'src/calibre/utils/lzx/lzxd.c',
+                                      'src/calibre/utils/lzx/lzc.c',
+                                      'src/calibre/utils/lzx/lzxc.c'],
                              include_dirs=['src/calibre/utils/lzx']),
                    
                    Extension('calibre.plugins.msdes',
@@ -391,13 +415,18 @@ if __name__ == '__main__':
         ext_modules.append(Extension('calibre.plugins.winutil',
                 sources=['src/calibre/utils/windows/winutil.c'],
                 libraries=['shell32', 'setupapi'],
-                include_dirs=['C:/WinDDK/6001.18001/inc/api/'])
-                           )
+                include_dirs=['C:/WinDDK/6001.18001/inc/api/',
+                              'C:/WinDDK/6001.18001/inc/crt/'],
+                extra_compile_args=['/X']
+                ))
     if isosx:
         ext_modules.append(Extension('calibre.plugins.usbobserver',
-                sources=['src/calibre/devices/usbobserver/usbobserver.c'])
+                sources=['src/calibre/devices/usbobserver/usbobserver.c'],
+                extra_link_args=['-framework', 'IOKit'])
                            )
     
+    plugins = ['plugins/%s.so'%(x.name.rpartition('.')[-1]) for x in ext_modules]
+
     setup(
           name           = APPNAME,
           packages       = find_packages('src'),
@@ -406,8 +435,7 @@ if __name__ == '__main__':
           author         = 'Kovid Goyal',
           author_email   = 'kovid@kovidgoyal.net',
           url            = 'http://%s.kovidgoyal.net'%APPNAME,
-          package_data   = {'calibre':['plugins/*']},
-          include_package_data = True,
+          package_data   = {'calibre':plugins},
           entry_points   = entry_points,
           zip_safe       = False,
           options        = { 'bdist_egg' : {'exclude_source_files': True,}, },
@@ -448,7 +476,8 @@ if __name__ == '__main__':
             ],
           cmdclass       = {
                       'build_ext'     : build_ext, 
-                      'build'         : build, 
+                      'build'         : build,
+                      'build_py'      : build_py, 
                       'pot'           : pot,
                       'manual'        : manual,
                       'resources'     : resources,
diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py
index 0e379ce9d1..e8d4b61ce1 100644
--- a/src/calibre/__init__.py
+++ b/src/calibre/__init__.py
@@ -13,13 +13,19 @@ from calibre.startup import plugins, winutil, winutilerror
 from calibre.constants import iswindows, isosx, islinux, isfrozen, \
                               terminal_controller, preferred_encoding, \
                               __appname__, __version__, __author__, \
-                              win32event, win32api, winerror, fcntl
+                              win32event, win32api, winerror, fcntl, \
+                              filesystem_encoding
 import mechanize
 
 mimetypes.add_type('application/epub+zip', '.epub')
 mimetypes.add_type('text/x-sony-bbeb+xml', '.lrs')
 mimetypes.add_type('application/x-sony-bbeb', '.lrf')
 
+def to_unicode(raw, encoding='utf-8', errors='strict'):
+    if isinstance(raw, unicode):
+        return raw
+    return raw.decode(encoding, errors)
+
 def unicode_path(path, abs=False):
     if not isinstance(path, unicode):
         path = path.decode(sys.getfilesystemencoding())
@@ -36,6 +42,28 @@ def osx_version():
             return int(m.group(1)), int(m.group(2)), int(m.group(3))
 
 
+_filename_sanitize = re.compile(r'[\xae\0\\|\?\*<":>\+\[\]/]')
+
+def sanitize_file_name(name, substitute='_', as_unicode=False):
+    '''
+    Sanitize the filename `name`. All invalid characters are replaced by `substitute`.
+    The set of invalid characters is the union of the invalid characters in Windows,
+    OS X and Linux. Also removes leading an trailing whitespace.
+    **WARNING:** This function also replaces path separators, so only pass file names
+    and not full paths to it.
+    *NOTE:* This function always returns byte strings, not unicode objects. The byte strings
+    are encoded in the filesystem encoding of the platform, or UTF-8. 
+    '''
+    if isinstance(name, unicode):
+        name = name.encode(filesystem_encoding, 'ignore')
+    one = _filename_sanitize.sub(substitute, name)
+    one = re.sub(r'\s', ' ', one).strip()
+    one = re.sub(r'^\.+$', '_', one)
+    if as_unicode:
+        one = one.decode(filesystem_encoding)
+    return one
+
+
 class CommandLineError(Exception):
     pass
 
@@ -196,13 +224,6 @@ class CurrentDir(object):
     def __exit__(self, *args):
         os.chdir(self.cwd)
 
-def sanitize_file_name(name):
-    '''
-    Remove characters that are illegal in filenames from name.
-    Also remove path separators. All illegal characters are replaced by
-    underscores.
-    '''
-    return re.sub(r'\s', ' ', re.sub(r'[\xae"\'\|\~\:\?\\\/]|^-', '_', name.strip()))
 
 def detect_ncpus():
     """Detects the number of effective CPUs in the system"""
@@ -317,7 +338,12 @@ class LoggingInterface:
     def ___log(self, func, msg, args, kwargs):
         args = [msg] + list(args)
         for i in range(len(args)):
-            if isinstance(args[i], unicode):
+            if not isinstance(args[i], basestring):
+                continue
+            if sys.version_info[:2] > (2, 5):
+                if not isinstance(args[i], unicode):
+                    args[i] = args[i].decode(preferred_encoding, 'replace')
+            elif isinstance(args[i], unicode):
                 args[i] = args[i].encode(preferred_encoding, 'replace')
         func(*args, **kwargs)
 
@@ -355,7 +381,13 @@ def strftime(fmt, t=time.localtime()):
             fmt = fmt.encode('mbcs')
         return plugins['winutil'][0].strftime(fmt, t)
     return time.strftime(fmt, t).decode(preferred_encoding, 'replace')
-    
+
+def my_unichr(num):
+    try:
+        return unichr(num)
+    except ValueError:
+        return u'?'
+
 def entity_to_unicode(match, exceptions=[], encoding='cp1252'):
     '''
     @param match: A match object such that '&'+match.group(1)';' is the entity.
@@ -371,7 +403,7 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252'):
     if ent.startswith(u'#x'):
         num = int(ent[2:], 16)
         if encoding is None or num > 255:
-            return unichr(num)
+            return my_unichr(num)
         return chr(num).decode(encoding)
     if ent.startswith(u'#'):
         try:
@@ -379,13 +411,13 @@ def entity_to_unicode(match, exceptions=[], encoding='cp1252'):
         except ValueError:
             return '&'+ent+';'
         if encoding is None or num > 255:
-            return unichr(num)
+            return my_unichr(num)
         try:
             return chr(num).decode(encoding)
         except UnicodeDecodeError:
-            return unichr(num)
+            return my_unichr(num)
     try:
-        return unichr(name2codepoint[ent])
+        return my_unichr(name2codepoint[ent])
     except KeyError:
         return '&'+ent+';'
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 390eb25c2a..41d89d3e85 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.4.109'
+__version__   = '0.4.125'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 '''
 Various run time constants.
@@ -29,6 +29,10 @@ winerror   = __import__('winerror') if iswindows else None
 win32api   = __import__('win32api') if iswindows else None
 fcntl      = None if iswindows else __import__('fcntl')
 
+filesystem_encoding = sys.getfilesystemencoding()
+if filesystem_encoding is None: filesystem_encoding = 'utf-8'
+
+
 ################################################################################
 plugins = None
 if plugins is None:
diff --git a/src/calibre/customize/__init__.py b/src/calibre/customize/__init__.py
new file mode 100644
index 0000000000..3d48f42535
--- /dev/null
+++ b/src/calibre/customize/__init__.py
@@ -0,0 +1,223 @@
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import sys
+
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.constants import __version__, __author__
+
+class Plugin(object):
+    '''
+    A calibre plugin. Useful members include:
+    
+       * ``self.plugin_path``: Stores path to the zip file that contains
+                               this plugin or None if it is a builtin
+                               plugin
+       * ``self.site_customization``: Stores a customization string entered
+                                      by the user.
+                                      
+    Methods that should be overridden in sub classes:
+    
+       * :meth:`initialize`
+       * :meth:`customization_help`
+    
+    Useful methods:
+    
+        * :meth:`temporary_file`
+        
+    '''
+    #: List of platforms this plugin works on
+    #: For example: ``['windows', 'osx', 'linux']
+    supported_platforms = []
+    
+    #: The name of this plugin
+    name           = 'Trivial Plugin'
+    
+    #: The version of this plugin as a 3-tuple (major, minor, revision)
+    version        = (1, 0, 0)
+    
+    #: A short string describing what this plugin does
+    description    = _('Does absolutely nothing')
+    
+    #: The author of this plugin
+    author         = _('Unknown')
+    
+    #: When more than one plugin exists for a filetype,
+    #: the plugins are run in order of decreasing priority
+    #: i.e. plugins with higher priority will be run first.
+    #: The highest possible priority is ``sys.maxint``.
+    #: Default pririty is 1.
+    priority = 1
+    
+    #: The earliest version of calibre this plugin requires
+    minimum_calibre_version = (0, 4, 118)
+    
+    #: If False, the user will not be able to disable this plugin. Use with
+    #: care.
+    can_be_disabled = True
+    
+    #: The type of this plugin. Used for categorizing plugins in the
+    #: GUI
+    type = _('Base')
+
+    def __init__(self, plugin_path):
+        self.plugin_path        = plugin_path
+        self.site_customization = None
+        
+    def initialize(self):
+        '''
+        Called once when calibre plugins are initialized. Plugins are re-initialized
+        every time a new plugin is added.
+        
+        Perform any plugin specific initialization here, such as extracting
+        resources from the plugin zip file. The path to the zip file is
+        available as ``self.plugin_path``.
+        
+        Note that ``self.site_customization`` is **not** available at this point.
+        '''
+        pass
+    
+    def customization_help(self, gui=False):
+        '''
+        Return a string giving help on how to customize this plugin.
+        By default raise a :class:`NotImplementedError`, which indicates that
+        the plugin does not require customization.
+        
+        If you re-implement this method in your subclass, the user will
+        be asked to enter a string as customization for this plugin.
+        The customization string will be available as 
+        ``self.site_customization``.
+        
+        Site customization could be anything, for example, the path to
+        a needed binary on the user's computer.
+        
+        :param gui: If True return HTML help, otherwise return plain text help. 
+        
+        '''
+        raise NotImplementedError
+        
+    def temporary_file(self, suffix):
+        '''
+        Return a file-like object that is a temporary file on the file system.
+        This file will remain available even after being closed and will only
+        be removed on interpreter shutdown. Use the ``name`` member of the
+        returned object to access the full path to the created temporary file.
+        
+        :param suffix: The suffix that the temporary file will have.
+        '''
+        return PersistentTemporaryFile(suffix)
+    
+    def is_customizable(self):
+        try:
+            self.customization_help()
+            return True
+        except NotImplementedError:
+            return False
+        
+    def __enter__(self, *args):
+        if self.plugin_path is not None:
+            sys.path.insert(0, self.plugin_path)
+            
+    def __exit__(self, *args):
+        if self.plugin_path in sys.path:
+            sys.path.remove(self.plugin_path)
+            
+            
+class FileTypePlugin(Plugin):
+    '''
+    A plugin that is associated with a particular set of file types.
+    '''
+    
+    #: Set of file types for which this plugin should be run
+    #: For example: ``set(['lit', 'mobi', 'prc'])``
+    file_types     = set([])
+    
+    #: If True, this plugin is run when books are added
+    #: to the database
+    on_import      = False
+    
+    #: If True, this plugin is run whenever an any2* tool
+    #: is used, on the file passed to the any2* tool.
+    on_preprocess  = False
+    
+    #: If True, this plugin is run after an any2* tool is
+    #: used, on the final file produced by the tool.
+    on_postprocess = False
+    
+    type = _('File type')
+
+    def run(self, path_to_ebook):
+        '''
+        Run the plugin. Must be implemented in subclasses.
+        It should perform whatever modifications are required 
+        on the ebook and return the absolute path to the 
+        modified ebook. If no modifications are needed, it should
+        return the path to the original ebook. If an error is encountered
+        it should raise an Exception. The default implementation
+        simply return the path to the original ebook.
+        
+        The modified ebook file should be created with the 
+        :meth:`temporary_file` method.
+        
+        :param path_to_ebook: Absolute path to the ebook.
+
+        :return: Absolute path to the modified ebook. 
+        '''
+        # Default implementation does nothing
+        return path_to_ebook
+    
+class MetadataReaderPlugin(Plugin):
+    '''
+    A plugin that implements reading metadata from a set of file types.
+    '''
+    #: Set of file types for which this plugin should be run
+    #: For example: ``set(['lit', 'mobi', 'prc'])``
+    file_types     = set([])
+    
+    supported_platforms = ['windows', 'osx', 'linux']
+    version = tuple(map(int, (__version__.split('.'))[:3]))
+    author  = 'Kovid Goyal'
+    
+    type = _('Metadata reader')
+    
+    def get_metadata(self, stream, type):
+        '''
+        Return metadata for the file represented by stream (a file like object
+        that supports reading). Raise an exception when there is an error 
+        with the input data.
+        
+        :param type: The type of file. Guaranteed to be one of the entries
+        in :attr:`file_types`.
+
+        :return: A :class:`calibre.ebooks.metadata.MetaInformation` object 
+        '''
+        return None
+    
+class MetadataWriterPlugin(Plugin):
+    '''
+    A plugin that implements reading metadata from a set of file types.
+    '''
+    #: Set of file types for which this plugin should be run
+    #: For example: ``set(['lit', 'mobi', 'prc'])``
+    file_types     = set([])
+    
+    supported_platforms = ['windows', 'osx', 'linux']
+    version = tuple(map(int, (__version__.split('.'))[:3]))
+    author  = 'Kovid Goyal'
+    
+    type = _('Metadata writer')
+    
+    def set_metadata(self, stream, mi, type):
+        '''
+        Set metadata for the file represented by stream (a file like object
+        that supports reading). Raise an exception when there is an error 
+        with the input data.
+        
+        :param type: The type of file. Guaranteed to be one of the entries
+        in :attr:`file_types`.
+        :param mi: A :class:`calibre.ebooks.metadata.MetaInformation` object 
+
+        '''
+        pass
+    
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
new file mode 100644
index 0000000000..28be488dce
--- /dev/null
+++ b/src/calibre/customize/builtins.py
@@ -0,0 +1,205 @@
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import textwrap, os
+from calibre.customize import FileTypePlugin, MetadataReaderPlugin, MetadataWriterPlugin
+from calibre.constants import __version__
+
+class HTML2ZIP(FileTypePlugin):
+    name = 'HTML to ZIP'
+    author = 'Kovid Goyal'
+    description = textwrap.dedent(_('''\
+Follow all local links in an HTML file and create a ZIP \
+file containing all linked files. This plugin is run \
+every time you add an HTML file to the library.\
+'''))
+    version = tuple(map(int, (__version__.split('.'))[:3]))
+    file_types = set(['html', 'htm', 'xhtml', 'xhtm'])
+    supported_platforms = ['windows', 'osx', 'linux']
+    on_import = True
+    
+    def run(self, htmlfile):
+        of = self.temporary_file('_plugin_html2zip.zip')
+        from calibre.ebooks.html import gui_main as html2oeb
+        html2oeb(htmlfile, of)
+        return of.name
+
+class RTFMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read RTF metadata' 
+    file_types  = set(['rtf'])
+    description = _('Read metadata from %s files')%'RTF'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.rtf import get_metadata
+        return get_metadata(stream)
+
+class FB2MetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read FB2 metadata'
+    file_types  = set(['fb2'])
+    description = _('Read metadata from %s files')%'FB2'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.fb2 import get_metadata
+        return get_metadata(stream)
+
+
+class LRFMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read LRF metadata'
+    file_types  = set(['lrf'])
+    description = _('Read metadata from %s files')%'LRF'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.lrf.meta import get_metadata
+        return get_metadata(stream)
+
+class PDFMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read PDF metadata'
+    file_types  = set(['pdf'])
+    description = _('Read metadata from %s files')%'PDF'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.pdf import get_metadata
+        return get_metadata(stream)
+
+class LITMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read LIT metadata'
+    file_types  = set(['lit'])
+    description = _('Read metadata from %s files')%'LIT'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.lit import get_metadata
+        return get_metadata(stream)
+
+class IMPMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read IMP metadata'
+    file_types  = set(['imp'])
+    description = _('Read metadata from %s files')%'IMP'
+    author      = 'Ashish Kulkarni'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.imp import get_metadata
+        return get_metadata(stream)
+
+class RBMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read RB metadata'
+    file_types  = set(['rb'])
+    description = _('Read metadata from %s files')%'RB'
+    author      = 'Ashish Kulkarni'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.rb import get_metadata
+        return get_metadata(stream)
+
+class EPUBMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read EPUB metadata'
+    file_types  = set(['epub'])
+    description = _('Read metadata from %s files')%'EPUB'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.epub import get_metadata
+        return get_metadata(stream)
+
+class HTMLMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read HTML metadata'
+    file_types  = set(['html'])
+    description = _('Read metadata from %s files')%'HTML'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.html import get_metadata
+        return get_metadata(stream)
+
+class MOBIMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read MOBI metadata'
+    file_types  = set(['mobi'])
+    description = _('Read metadata from %s files')%'MOBI'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.mobi.reader import get_metadata
+        return get_metadata(stream)
+
+class ODTMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read ODT metadata'
+    file_types  = set(['odt'])
+    description = _('Read metadata from %s files')%'ODT'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.odt import get_metadata
+        return get_metadata(stream)
+
+class LRXMetadataReader(MetadataReaderPlugin):
+    
+    name        = 'Read LRX metadata'
+    file_types  = set(['lrx'])
+    description = _('Read metadata from %s files')%'LRX'
+    
+    def get_metadata(self, stream, ftype):
+        from calibre.ebooks.metadata.lrx import get_metadata
+        return get_metadata(stream)
+
+class ComicMetadataReader(MetadataReaderPlugin):
+    
+    name = 'Read comic metadata'
+    file_types = set(['cbr', 'cbz'])
+    description = _('Extract cover from comic files')
+    
+    def get_metadata(self, stream, ftype):
+        if ftype == 'cbr':
+            from calibre.libunrar import extract_member as extract_first
+        else:
+            from calibre.libunzip import extract_member as extract_first
+        from calibre.ebooks.metadata import MetaInformation 
+        ret = extract_first(stream)
+        mi = MetaInformation(None, None)
+        if ret is not None:
+            path, data = ret
+            ext = os.path.splitext(path)[1][1:]
+            mi.cover_data = (ext.lower(), data)
+        return mi
+
+class EPUBMetadataWriter(MetadataWriterPlugin):
+    
+    name = 'Set EPUB metadata'
+    file_types = set(['epub'])
+    description = _('Set metadata in EPUB files')
+    
+    def set_metadata(self, stream, mi, type):
+        from calibre.ebooks.metadata.epub import set_metadata
+        set_metadata(stream, mi)
+        
+class LRFMetadataWriter(MetadataWriterPlugin):
+    
+    name = 'Set LRF metadata'
+    file_types = set(['lrf'])
+    description = _('Set metadata in LRF files')
+    
+    def set_metadata(self, stream, mi, type):
+        from calibre.ebooks.lrf.meta import set_metadata
+        set_metadata(stream, mi)
+
+class RTFMetadataWriter(MetadataWriterPlugin):
+    
+    name = 'Set RTF metadata'
+    file_types = set(['rtf'])
+    description = _('Set metadata in RTF files')
+    
+    def set_metadata(self, stream, mi, type):
+        from calibre.ebooks.metadata.rtf import set_metadata
+        set_metadata(stream, mi)
+
+plugins = [HTML2ZIP]
+plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
+                                        x.__name__.endswith('MetadataReader')]
+plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
+                                        x.__name__.endswith('MetadataWriter')]
\ No newline at end of file
diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py
new file mode 100644
index 0000000000..240621c51e
--- /dev/null
+++ b/src/calibre/customize/ui.py
@@ -0,0 +1,320 @@
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+import os, shutil, traceback, functools, sys
+
+from calibre.customize import Plugin, FileTypePlugin, MetadataReaderPlugin, \
+                              MetadataWriterPlugin
+from calibre.customize.builtins import plugins as builtin_plugins
+from calibre.constants import __version__, iswindows, isosx
+from calibre.ebooks.metadata import MetaInformation
+from calibre.utils.config import make_config_dir, Config, ConfigProxy, \
+                                 plugin_dir, OptionParser
+
+
+version = tuple([int(x) for x in __version__.split('.')])
+
+platform = 'linux'
+if iswindows:
+    platform = 'windows'
+if isosx:
+    platform = 'osx'
+
+from zipfile import ZipFile
+
+def _config():
+    c = Config('customize')
+    c.add_opt('plugins', default={}, help=_('Installed plugins'))
+    c.add_opt('filetype_mapping', default={}, help=_('Mapping for filetype plugins'))
+    c.add_opt('plugin_customization', default={}, help=_('Local plugin customization'))
+    c.add_opt('disabled_plugins', default=set([]), help=_('Disabled plugins'))
+    
+    return ConfigProxy(c)
+
+config = _config()
+
+
+class InvalidPlugin(ValueError):
+    pass
+
+class PluginNotFound(ValueError):
+    pass
+
+def load_plugin(path_to_zip_file):
+    '''
+    Load plugin from zip file or raise InvalidPlugin error
+    
+    :return: A :class:`Plugin` instance.
+    '''
+    print 'Loading plugin from', path_to_zip_file
+    if not os.access(path_to_zip_file, os.R_OK):
+        raise PluginNotFound
+    zf = ZipFile(path_to_zip_file)
+    for name in zf.namelist():
+        if name.lower().endswith('plugin.py'):
+            locals = {}
+            exec zf.read(name) in locals
+            for x in locals.values():
+                if isinstance(x, type) and issubclass(x, Plugin):
+                    if x.minimum_calibre_version > version or \
+                        platform not in x.supported_platforms:
+                        continue
+                    
+                    return x
+            
+    raise InvalidPlugin(_('No valid plugin found in ')+path_to_zip_file)
+
+_initialized_plugins = []
+_on_import           = {}
+_on_preprocess       = {}
+_on_postprocess      = {}
+
+
+
+def reread_filetype_plugins():
+    global _on_import
+    global _on_preprocess
+    global _on_postprocess
+    _on_import           = {}
+    _on_preprocess       = {}
+    _on_postprocess      = {}
+
+    for plugin in _initialized_plugins:
+        if isinstance(plugin, FileTypePlugin):
+            for ft in plugin.file_types:
+                if plugin.on_import:
+                    if not _on_import.has_key(ft):
+                        _on_import[ft] = []
+                    _on_import[ft].append(plugin)
+                if plugin.on_preprocess:
+                    if not _on_preprocess.has_key(ft):
+                        _on_preprocess[ft] = []
+                    _on_preprocess[ft].append(plugin)
+                if plugin.on_postprocess:
+                    if not _on_postprocess.has_key(ft):
+                        _on_postprocess[ft] = []
+                    _on_postprocess[ft].append(plugin)
+
+_metadata_readers = {}
+_metadata_writers = {}
+def reread_metadata_plugins():
+    global _metadata_readers
+    global _metadata_writers
+    _metadata_readers = {}
+    for plugin in _initialized_plugins:
+        if isinstance(plugin, MetadataReaderPlugin):
+            for ft in plugin.file_types:
+                _metadata_readers[ft] = plugin
+        elif isinstance(plugin, MetadataWriterPlugin):
+            for ft in plugin.file_types:
+                _metadata_writers[ft] = plugin 
+                
+def get_file_type_metadata(stream, ftype):
+    mi = MetaInformation(None, None)
+    try:
+        plugin = _metadata_readers[ftype.lower().strip()]
+        if not is_disabled(plugin):
+            with plugin:
+                mi = plugin.get_metadata(stream, ftype.lower().strip())
+    except:
+        pass
+    return mi
+
+def set_file_type_metadata(stream, mi, ftype):
+    try:
+        plugin = _metadata_writers[ftype.lower().strip()]
+        if not is_disabled(plugin):
+            with plugin:
+                plugin.set_metadata(stream, mi, ftype.lower().strip())
+    except:
+        traceback.print_exc()
+                
+def _run_filetype_plugins(path_to_file, ft=None, occasion='preprocess'):
+    occasion = {'import':_on_import, 'preprocess':_on_preprocess, 
+                'postprocess':_on_postprocess}[occasion]
+    customization = config['plugin_customization']
+    if ft is None:
+        ft = os.path.splitext(path_to_file)[-1].lower().replace('.', '')        
+    nfp = path_to_file
+    for plugin in occasion.get(ft, []):
+        if is_disabled(plugin):
+            continue
+        plugin.site_customization = customization.get(plugin.name, '') 
+        with plugin:
+            try:
+                nfp = plugin.run(path_to_file)
+            except:
+                print 'Running file type plugin %s failed with traceback:'%plugin.name
+                traceback.print_exc()
+    x = lambda j : os.path.normpath(os.path.normcase(j))
+    if occasion == 'postprocess' and x(nfp) != x(path_to_file):
+        shutil.copyfile(nfp, path_to_file)
+        nfp = path_to_file
+    return nfp
+
+run_plugins_on_import      = functools.partial(_run_filetype_plugins, 
+                                               occasion='import')
+run_plugins_on_preprocess  = functools.partial(_run_filetype_plugins, 
+                                               occasion='preprocess')
+run_plugins_on_postprocess = functools.partial(_run_filetype_plugins, 
+                                               occasion='postprocess')
+                
+
+def initialize_plugin(plugin, path_to_zip_file):
+    try:
+        return plugin(path_to_zip_file)
+    except Exception:
+        print 'Failed to initialize plugin:', plugin.name, plugin.version
+        tb = traceback.format_exc()
+        raise InvalidPlugin((_('Initialization of plugin %s failed with traceback:')
+                            %tb) + '\n'+tb)
+    
+
+def add_plugin(path_to_zip_file):
+    make_config_dir()
+    plugin = load_plugin(path_to_zip_file)
+    plugin = initialize_plugin(plugin, path_to_zip_file)
+    plugins = config['plugins']
+    zfp = os.path.join(plugin_dir, plugin.name+'.zip')
+    if os.path.exists(zfp):
+        os.remove(zfp)
+    shutil.copyfile(path_to_zip_file, zfp)
+    plugins[plugin.name] = zfp
+    config['plugins'] = plugins
+    initialize_plugins()
+    return plugin
+
+def remove_plugin(plugin_or_name):
+    name = getattr(plugin_or_name, 'name', plugin_or_name)
+    plugins = config['plugins']
+    removed = False
+    if name in plugins.keys():
+        removed = True
+        zfp = plugins[name]
+        if os.path.exists(zfp):
+            os.remove(zfp)
+        plugins.pop(name)
+    config['plugins'] = plugins
+    initialize_plugins()
+    return removed
+
+def is_disabled(plugin):
+    return plugin.name in config['disabled_plugins']
+
+def find_plugin(name):
+    for plugin in _initialized_plugins:
+        if plugin.name == name:
+            return plugin
+
+def disable_plugin(plugin_or_name):
+    x = getattr(plugin_or_name, 'name', plugin_or_name)
+    plugin = find_plugin(x)
+    if not plugin.can_be_disabled:
+        raise ValueError('Plugin %s cannot be disabled'%x)
+    dp = config['disabled_plugins']
+    dp.add(x)
+    config['disabled_plugins'] = dp
+
+def enable_plugin(plugin_or_name):
+    x = getattr(plugin_or_name, 'name', plugin_or_name)
+    dp = config['disabled_plugins']
+    if x in dp:
+        dp.remove(x)
+    config['disabled_plugins'] = dp
+
+def initialize_plugins():
+    global _initialized_plugins
+    _initialized_plugins = []
+    for zfp in list(config['plugins'].values()) + builtin_plugins:
+        try:
+            try:
+                plugin = load_plugin(zfp) if not isinstance(zfp, type) else zfp
+            except PluginNotFound:
+                continue
+            plugin = initialize_plugin(plugin, zfp if not isinstance(zfp, type) else zfp)
+            _initialized_plugins.append(plugin)
+        except:
+            print 'Failed to initialize plugin...'
+            traceback.print_exc()
+    _initialized_plugins.sort(cmp=lambda x,y:cmp(x.priority, y.priority), reverse=True)    
+    reread_filetype_plugins()
+    reread_metadata_plugins()
+    
+initialize_plugins()
+
+def option_parser():
+    parser = OptionParser(usage=_('''\
+    %prog options
+    
+    Customize calibre by loading external plugins.
+    '''))
+    parser.add_option('-a', '--add-plugin', default=None, 
+                      help=_('Add a plugin by specifying the path to the zip file containing it.'))
+    parser.add_option('-r', '--remove-plugin', default=None, 
+                      help=_('Remove a custom plugin by name. Has no effect on builtin plugins'))
+    parser.add_option('--customize-plugin', default=None,
+                      help=_('Customize plugin. Specify name of plugin and customization string separated by a comma.'))
+    parser.add_option('-l', '--list-plugins', default=False, action='store_true',
+                      help=_('List all installed plugins'))
+    parser.add_option('--enable-plugin', default=None,
+                      help=_('Enable the named plugin'))
+    parser.add_option('--disable-plugin', default=None,
+                      help=_('Disable the named plugin'))
+    return parser
+
+def initialized_plugins():
+    return _initialized_plugins
+
+def customize_plugin(plugin, custom):
+    d = config['plugin_customization']
+    d[plugin.name] = custom.strip()
+    config['plugin_customization'] = d
+
+def plugin_customization(plugin):
+    return config['plugin_customization'].get(plugin.name, '')
+
+def main(args=sys.argv):
+    parser = option_parser()
+    if len(args) < 2:
+        parser.print_help()
+        return 1
+    opts, args = parser.parse_args(args)
+    if opts.add_plugin is not None:
+        plugin = add_plugin(opts.add_plugin)
+        print 'Plugin added:', plugin.name, plugin.version
+    if opts.remove_plugin is not None:
+        if remove_plugin(opts.remove_plugin):
+            print 'Plugin removed'
+        else:
+            print 'No custom pluginnamed', opts.remove_plugin
+    if opts.customize_plugin is not None:
+        name, custom = opts.customize_plugin.split(',')
+        plugin = find_plugin(name.strip())
+        if plugin is None:
+            print 'No plugin with the name %s exists'%name
+            return 1
+        customize_plugin(plugin, custom)
+    if opts.enable_plugin is not None:
+        enable_plugin(opts.enable_plugin.strip())
+    if opts.disable_plugin is not None:
+        disable_plugin(opts.disable_plugin.strip())
+    if opts.list_plugins:
+        fmt = '%-15s%-20s%-15s%-15s%s'
+        print fmt%tuple(('Type|Name|Version|Disabled|Site Customization'.split('|')))
+        print
+        for plugin in initialized_plugins():
+            print fmt%(
+                                plugin.type, plugin.name, 
+                                plugin.version, is_disabled(plugin), 
+                                plugin_customization(plugin)
+                                )
+            print '\t', plugin.description
+            if plugin.is_customizable():
+                print '\t', plugin.customization_help()
+            print
+        
+    return 0
+    
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index 796e98c8d5..274089baa1 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -21,8 +21,10 @@ Run an embedded python interpreter.
     'Module specifications are of the form full.name.of.module,path_to_module.py', default=None
     )
     parser.add_option('-c', '--command', help='Run python code.', default=None)
+    parser.add_option('-g', '--gui',  default=False, action='store_true',
+                      help='Run the GUI',)
     parser.add_option('--migrate', action='store_true', default=False, 
-                      help='Migrate old database. Needs two arguments. Path to library1.db and path to new library folder.', default=False)
+                      help='Migrate old database. Needs two arguments. Path to library1.db and path to new library folder.')
     return parser
 
 def update_zipfile(zipfile, mod, path):
@@ -72,7 +74,10 @@ def migrate(old, new):
 
 def main(args=sys.argv):
     opts, args = option_parser().parse_args(args)
-    if opts.update_module:
+    if opts.gui:
+        from calibre.gui2.main import main
+        main(['calibre'])
+    elif opts.update_module:
         mod, path = opts.update_module.partition(',')[0], opts.update_module.partition(',')[-1]
         update_module(mod, os.path.expanduser(path))
     elif opts.command:
diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py
index f2c89ea1c5..f300c666b9 100644
--- a/src/calibre/devices/__init__.py
+++ b/src/calibre/devices/__init__.py
@@ -1,5 +1,6 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
 '''
 Device drivers.
 '''
@@ -8,8 +9,9 @@ def devices():
     from calibre.devices.prs500.driver import PRS500
     from calibre.devices.prs505.driver import PRS505
     from calibre.devices.prs700.driver import PRS700
+    from calibre.devices.cybookg3.driver import CYBOOKG3
     #from calibre.devices.kindle.driver import KINDLE
-    return (PRS500, PRS505, PRS700)
+    return (PRS500, PRS505, PRS700, CYBOOKG3)
 
 import time
 
diff --git a/src/calibre/devices/cybookg3/__init__.py b/src/calibre/devices/cybookg3/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/calibre/devices/cybookg3/books.py b/src/calibre/devices/cybookg3/books.py
new file mode 100644
index 0000000000..ed3df812db
--- /dev/null
+++ b/src/calibre/devices/cybookg3/books.py
@@ -0,0 +1,78 @@
+__license__   = 'GPL v3'
+__copyright__ = '2009, John Schember <john at nachtimwald.com'
+
+'''
+'''
+import os, fnmatch, time
+
+from calibre.devices.interface import BookList as _BookList
+
+EBOOK_DIR = "eBooks"
+EBOOK_TYPES = ['mobi', 'prc', 'html', 'pdf', 'rtf', 'txt']
+
+class Book(object):
+    def __init__(self, path, title, authors):
+        self.title = title
+        self.authors = authors
+        self.size = os.path.getsize(path)
+        self.datetime = time.gmtime(os.path.getctime(path))
+        self.path = path
+        self.thumbnail = None
+        self.tags = []
+        
+    @apply
+    def thumbnail():
+        return None
+        
+    def __str__(self):
+        """ Return a utf-8 encoded string with title author and path information """
+        return self.title.encode('utf-8') + " by " + \
+               self.authors.encode('utf-8') + " at " + self.path.encode('utf-8')
+
+
+class BookList(_BookList):
+    def __init__(self, mountpath):
+        self._mountpath = mountpath
+        _BookList.__init__(self)            
+        self.return_books(mountpath)  
+
+    def return_books(self, mountpath):
+        # Get all books in all directories under the root EBOOK_DIR directory
+        for path, dirs, files in os.walk(os.path.join(mountpath, EBOOK_DIR)):
+            # Filter out anything that isn't in the list of supported ebook types
+            for book_type in EBOOK_TYPES:
+                for filename in fnmatch.filter(files, '*.%s' % (book_type)):
+                    book_title = ''
+                    book_author = ''
+                    # Calibre uses a specific format for file names. They take the form
+                    # title_-_author_number.extention We want to see if the file name is
+                    # in this format.
+                    if fnmatch.fnmatchcase(filename, '*_-_*.*'):
+                        # Get the title and author from the file name
+                        title, sep, author = filename.rpartition('_-_')
+                        author, sep, ext = author.rpartition('_')
+                        book_title = title.replace('_', ' ')
+                        book_author = author.replace('_', ' ')
+                    # if the filename did not match just set the title to
+                    # the filename without the extension
+                    else:
+                        book_title = os.path.splitext(filename)[0].replace('_', ' ')
+
+                    self.append(Book(os.path.join(path, filename), book_title, book_author))
+            
+    def add_book(self, path, title):
+        self.append(Book(path, title, ""))
+
+    def remove_book(self, path):
+        for book in self:
+            if path.endswith(book.path):
+                self.remove(book)
+                break
+            
+    def supports_tags(self):
+        ''' Return True if the the device supports tags (collections) for this book list. '''
+        return False
+    
+    def set_tags(self, book, tags):
+        pass
+
diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
new file mode 100644
index 0000000000..661c98cc44
--- /dev/null
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -0,0 +1,325 @@
+__license__   = 'GPL v3'
+__copyright__ = '2009, John Schember <john at nachtimwald.com'
+
+'''
+Device driver for Bookeen's Cybook Gen 3
+'''
+import os, fnmatch, shutil, time
+from itertools import cycle
+
+from calibre.devices.interface import Device
+from calibre.devices.errors import DeviceError, FreeSpaceError
+
+from calibre.devices.cybookg3.books import BookList, EBOOK_DIR, EBOOK_TYPES
+from calibre import iswindows, islinux, isosx, __appname__
+
+class CYBOOKG3(Device):
+    # Ordered list of supported formats
+    FORMATS     = EBOOK_TYPES
+    VENDOR_ID   = 0x0bda
+    PRODUCT_ID  = 0x0703
+    BCD         = 0x110
+    #THUMBNAIL_HEIGHT = 68 # Height for thumbnails on device
+    
+    MAIN_MEMORY_VOLUME_LABEL  = 'Cybook Gen 3 Main Memory'
+    STORAGE_CARD_VOLUME_LABEL = 'Cybook Gen 3 Storage Card'
+    
+    FDI_TEMPLATE = \
+'''
+  <device>
+      <match key="info.category" string="volume">
+          <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
+              <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
+                  <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">
+                      <match key="volume.is_partition" bool="false">
+                          <merge key="volume.label" type="string">%(main_memory)s</merge>
+                          <merge key="%(app)s.mainvolume" type="string">%(deviceclass)s</merge>
+                      </match>
+                  </match>
+              </match>
+          </match>
+      </match>
+  </device>
+  <device>
+      <match key="info.category" string="volume">
+          <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
+              <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
+                  <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">
+                      <match key="volume.is_partition" bool="true">
+                          <merge key="volume.label" type="string">%(storage_card)s</merge>
+                          <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
+                      </match>
+                  </match>
+              </match>
+          </match>
+      </match>
+  </device>
+'''
+    
+    
+    def __init__(self, key='-1', log_packets=False, report_progress=None) :
+        self._main_prefix = self._card_prefix = None
+    
+    @classmethod
+    def get_fdi(cls):
+        return cls.FDI_TEMPLATE%dict(
+                                     app=__appname__,
+                                     deviceclass=cls.__name__,
+                                     vendor_id=hex(cls.VENDOR_ID),
+                                     product_id=hex(cls.PRODUCT_ID),
+                                     bcd=hex(cls.BCD),
+                                     main_memory=cls.MAIN_MEMORY_VOLUME_LABEL,
+                                     storage_card=cls.STORAGE_CARD_VOLUME_LABEL,
+                                     )
+    
+    def set_progress_reporter(self, report_progress):
+        self.report_progress = report_progress
+    
+    def get_device_information(self, end_session=True):
+        """ 
+        Ask device for device information. See L{DeviceInfoQuery}. 
+        @return: (device name, device version, software version on device, mime type)
+        """
+        return (self.__class__.__name__, '', '', '')
+    
+    def card_prefix(self, end_session=True):
+        return self._card_prefix
+    
+    @classmethod
+    def _windows_space(cls, prefix):
+        if prefix is None:
+            return 0, 0
+        win32file = __import__('win32file', globals(), locals(), [], -1)
+        try:
+            sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters = \
+                win32file.GetDiskFreeSpace(prefix[:-1])
+        except Exception, err:
+            if getattr(err, 'args', [None])[0] == 21: # Disk not ready
+                time.sleep(3)
+                sectors_per_cluster, bytes_per_sector, free_clusters, total_clusters = \
+                    win32file.GetDiskFreeSpace(prefix[:-1])
+            else: raise
+        mult = sectors_per_cluster * bytes_per_sector
+        return total_clusters * mult, free_clusters * mult
+    
+    def total_space(self, end_session=True):
+        msz = csz = 0
+        print self._main_prefix
+        if not iswindows:
+            if self._main_prefix is not None:
+                stats = os.statvfs(self._main_prefix)
+                msz = stats.f_frsize * (stats.f_blocks + stats.f_bavail - stats.f_bfree)
+            if self._card_prefix is not None:
+                stats = os.statvfs(self._card_prefix)
+                csz = stats.f_frsize * (stats.f_blocks + stats.f_bavail - stats.f_bfree)
+        else:
+            msz = self._windows_space(self._main_prefix)[0]
+            csz = self._windows_space(self._card_prefix)[0]
+                
+        return (msz, 0, csz)
+    
+    def free_space(self, end_session=True):
+        msz = csz = 0
+        if not iswindows:
+            if self._main_prefix is not None:
+                stats = os.statvfs(self._main_prefix)
+                msz = stats.f_frsize * stats.f_bavail
+            if self._card_prefix is not None:
+                stats = os.statvfs(self._card_prefix)
+                csz = stats.f_frsize * stats.f_bavail
+        else:
+            msz = self._windows_space(self._main_prefix)[1]
+            csz = self._windows_space(self._card_prefix)[1]
+                
+        return (msz, 0, csz)
+    
+    def books(self, oncard=False, end_session=True):
+        if oncard and self._card_prefix is None:
+            return []
+        prefix = self._card_prefix if oncard else self._main_prefix
+        bl = BookList(prefix)
+        return bl
+    
+    def upload_books(self, files, names, on_card=False, end_session=True):
+        if on_card and not self._card_prefix:
+            raise ValueError(_('The reader has no storage card connected.'))
+            
+        if not on_card:
+            path = os.path.join(self._main_prefix, EBOOK_DIR)
+        else:
+            path = os.path.join(self._card_prefix, EBOOK_DIR)
+            
+        sizes = map(os.path.getsize, files)
+        size = sum(sizes)
+    
+        if on_card and size > self.free_space()[2] - 1024*1024: 
+            raise FreeSpaceError("There is insufficient free space "+\
+                                          "on the storage card")
+        if not on_card and size > self.free_space()[0] - 2*1024*1024: 
+            raise FreeSpaceError("There is insufficient free space " +\
+                                         "in main memory")
+
+        paths = []
+        names = iter(names)
+        
+        for infile in files:
+            filepath = os.path.join(path, names.next())
+            paths.append(filepath)
+            
+            shutil.copy2(infile, filepath)
+    
+        return zip(paths, cycle([on_card]))
+    
+    @classmethod
+    def add_books_to_metadata(cls, locations, metadata, booklists):
+        for location in locations:
+            path = location[0]
+            on_card = 1 if location[1] else 0
+            booklists[on_card].add_book(path, os.path.basename(path))
+    
+    def delete_books(self, paths, end_session=True):
+        for path in paths:
+            if os.path.exists(path):
+                # Delete the ebook
+                os.unlink(path)
+                
+                filepath, ext = os.path.splitext(path)
+                basepath, filename = os.path.split(filepath)
+                
+                # Delete the ebook auxiliary file
+                if os.path.exists(filepath + '.mbp'):
+                    os.unlink(filepath + '.mbp')
+                
+                # Delete the thumbnails file auto generated for the ebook
+                for p, d, files in os.walk(basepath):
+                    for filen in fnmatch.filter(files, filename + "*.t2b"):
+                        os.unlink(os.path.join(p, filen))
+    
+    @classmethod
+    def remove_books_from_metadata(cls, paths, booklists):
+        for path in paths:
+            for bl in booklists:
+                bl.remove_book(path)
+        
+    def sync_booklists(self, booklists, end_session=True):
+        # There is no meta data on the device to update. The device is treated
+        # as a mass storage device and does not use a meta data xml file like
+        # the Sony Readers.
+        pass
+    
+    def get_file(self, path, outfile, end_session=True): 
+        path = self.munge_path(path)
+        src = open(path, 'rb')
+        shutil.copyfileobj(src, outfile, 10*1024*1024)
+    
+    def munge_path(self, path):
+        if path.startswith('/') and not (path.startswith(self._main_prefix) or \
+            (self._card_prefix and path.startswith(self._card_prefix))):
+            path = self._main_prefix + path[1:]
+        elif path.startswith('card:'):
+            path = path.replace('card:', self._card_prefix[:-1])
+        return path
+        
+
+    def _windows_match_device(self, device_id):
+        device_id = device_id.upper()
+        vid, pid = hex(cls.VENDOR_ID)[2:], hex(cls.PRODUCT_ID)[2:]        
+        while len(vid) < 4: vid = '0' + vid
+        while len(pid) < 4: pid = '0' + pid        
+        if 'VID_'+vid in device_id and 'PID_'+pid in device_id:
+            return True
+        return False
+
+    # This only supports Windows >= 2000
+    def open_windows(self):
+        drives = []
+        wmi = __import__('wmi', globals(), locals(), [], -1) 
+        c = wmi.WMI()
+        for drive in c.Win32_DiskDrive():
+            if self._windows_match_device(str(drive.PNPDeviceID)):
+                if drive.Partitions == 0:
+                    continue
+                try:
+                    partition = drive.associators("Win32_DiskDriveToDiskPartition")[0]
+                    logical_disk = partition.associators('Win32_LogicalDiskToPartition')[0]
+                    prefix = logical_disk.DeviceID+os.sep
+                    drives.append((drive.Index, prefix))
+                except IndexError:
+                    continue
+                
+        if not drives:
+            raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.')%self.__class__.__name__)
+        
+        drives.sort(cmp=lambda a, b: cmp(a[0], b[0]))
+        self._main_prefix = drives[0][1]
+        if len(drives) > 1:
+            self._card_prefix = drives[1][1]            
+        
+    def open_osx(self):
+        raise NotImplementedError()
+
+    def open_linux(self):
+        import dbus
+        bus = dbus.SystemBus() 
+        hm  = dbus.Interface(bus.get_object("org.freedesktop.Hal", "/org/freedesktop/Hal/Manager"), "org.freedesktop.Hal.Manager")
+        
+        def conditional_mount(dev):
+            mmo = bus.get_object("org.freedesktop.Hal", dev)
+            label = mmo.GetPropertyString('volume.label', dbus_interface='org.freedesktop.Hal.Device')
+            is_mounted = mmo.GetPropertyString('volume.is_mounted', dbus_interface='org.freedesktop.Hal.Device')
+            mount_point = mmo.GetPropertyString('volume.mount_point', dbus_interface='org.freedesktop.Hal.Device')
+            fstype = mmo.GetPropertyString('volume.fstype', dbus_interface='org.freedesktop.Hal.Device')
+            if is_mounted:
+                return str(mount_point)
+            mmo.Mount(label, fstype, ['umask=077', 'uid='+str(os.getuid()), 'sync'], 
+                          dbus_interface='org.freedesktop.Hal.Device.Volume')
+            return os.path.normpath('/media/'+label)+'/'
+        
+        mm = hm.FindDeviceStringMatch(__appname__+'.mainvolume', self.__class__.__name__)
+        if not mm:
+            raise DeviceError(_('Unable to detect the %s disk drive. Try rebooting.')%(self.__class__.__name__,))
+        self._main_prefix = None
+        for dev in mm:
+            try:
+                self._main_prefix = conditional_mount(dev)+os.sep
+                break
+            except dbus.exceptions.DBusException:
+                continue
+                
+        if not self._main_prefix:
+            raise DeviceError('Could not open device for reading. Try a reboot.')
+            
+        self._card_prefix = None
+        cards = hm.FindDeviceStringMatch(__appname__+'.cardvolume', self.__class__.__name__)
+        
+        for dev in cards:
+            try:
+                self._card_prefix = conditional_mount(dev)+os.sep
+                break
+            except:
+                import traceback
+                print traceback
+                continue
+
+    def open(self):
+        time.sleep(5)
+        self._main_prefix = self._card_prefix = None
+        if islinux:
+            try:
+                self.open_linux()
+            except DeviceError:
+                time.sleep(3)
+                self.open_linux()
+        if iswindows:
+            try:
+                self.open_windows()
+            except DeviceError:
+                time.sleep(3)
+                self.open_windows()
+        if isosx:
+            try:
+                self.open_osx()
+            except DeviceError:
+                time.sleep(3)
+                self.open_osx()
+
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index fb581e9545..e2959cd49f 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -39,6 +39,18 @@ class Device(object):
         '''Return the FDI description of this device for HAL on linux.'''
         return ''
     
+    def open(self):
+        '''
+        Perform any device specific initialization. Called after the device is
+        detected but before any other functions that communicate with the device.
+        For example: For devices that present themselves as USB Mass storage
+        devices, this method would be responsible for mounting the device or
+        if the device has been automounted, for finding out where it has been 
+        mounted. The driver for the PRS505 has a implementation of this function
+        that should serve as a good example for USB Mass storage devices.
+        '''
+        raise NotImplementedError()
+    
     def set_progress_reporter(self, report_progress):
         '''
         @param report_progress: Function that is called with a % progress 
diff --git a/src/calibre/devices/libusb.py b/src/calibre/devices/libusb.py
index 0bedce32bb..226a99f239 100644
--- a/src/calibre/devices/libusb.py
+++ b/src/calibre/devices/libusb.py
@@ -4,17 +4,20 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 This module provides a thin ctypes based wrapper around libusb. 
 """
 
-from ctypes import cdll, POINTER, byref, pointer, Structure, \
+from ctypes import cdll, POINTER, byref, pointer, Structure as _Structure, \
                    c_ubyte, c_ushort, c_int, c_char, c_void_p, c_byte, c_uint
 from errno import EBUSY, ENOMEM
 
-from calibre import iswindows, isosx, load_library, isfrozen
+from calibre import iswindows, isosx, load_library
 
 _libusb_name = 'libusb'
 PATH_MAX = 511 if iswindows else 1024 if isosx else 4096
 if iswindows:
-    Structure._pack_ = 1
+    class Structure(_Structure):
+        _pack_ = 1
     _libusb_name = 'libusb0'
+else:
+    Structure = _Structure
 
 try:
     try:
diff --git a/src/calibre/devices/prs505/books.py b/src/calibre/devices/prs505/books.py
index f42f1b5513..b63b089fdd 100644
--- a/src/calibre/devices/prs505/books.py
+++ b/src/calibre/devices/prs505/books.py
@@ -60,7 +60,7 @@ class Book(object):
     rpath        = book_metadata_field("path")
     id           = book_metadata_field("id", formatter=int)
     sourceid     = book_metadata_field("sourceid", formatter=int)
-    size         = book_metadata_field("size", formatter=int)
+    size         = book_metadata_field("size", formatter=lambda x : int(float(x)))
     # When setting this attribute you must use an epoch
     datetime     = book_metadata_field("date", formatter=strptime, setter=strftime)
     
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index 698a8f2a03..0f60d7238b 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -19,10 +19,10 @@ class File(object):
         self.is_readonly = not os.access(path, os.W_OK)
         self.ctime = stats.st_ctime
         self.wtime = stats.st_mtime
-        self.size  = stats.st_size 
-        if path.endswith(os.sep): 
+        self.size  = stats.st_size
+        if path.endswith(os.sep):
             path = path[:-1]
-        self.path = path                        
+        self.path = path
         self.name = os.path.basename(path)
         
 
@@ -64,9 +64,11 @@ class PRS505(Device):
       <match key="info.category" string="volume">
           <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.vendor_id" int="%(vendor_id)s">
               <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.product_id" int="%(product_id)s">
-                  <match key="volume.is_partition" bool="true">
-                      <merge key="volume.label" type="string">%(storage_card)s</merge>
-                      <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
+                  <match key="@info.parent:@info.parent:@info.parent:@info.parent:usb.device_revision_bcd" int="%(bcd)s">
+                      <match key="volume.is_partition" bool="true">
+                          <merge key="volume.label" type="string">%(storage_card)s</merge>
+                          <merge key="%(app)s.cardvolume" type="string">%(deviceclass)s</merge>
+                      </match>
                   </match>
               </match>
           </match>
@@ -106,7 +108,10 @@ class PRS505(Device):
     @classmethod
     def get_osx_mountpoints(cls, raw=None):
         if raw is None:
-            raw = subprocess.Popen('ioreg -w 0 -S -c IOMedia'.split(), 
+            ioreg = '/usr/sbin/ioreg'
+            if not os.access(ioreg, os.X_OK):
+                ioreg = 'ioreg'
+            raw = subprocess.Popen((ioreg+' -w 0 -S -c IOMedia').split(),
                                    stdout=subprocess.PIPE).stdout.read()
         lines = raw.splitlines()
         names = {}
diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py
index 99a50020ec..40573114a7 100644
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@@ -43,7 +43,8 @@ class DeviceScanner(object):
         if iswindows:
             for device_id in self.devices:
                 vid, pid = 'vid_%4.4x'%device.VENDOR_ID, 'pid_%4.4x'%device.PRODUCT_ID
-                if vid in device_id and pid in device_id:
+                rev = ('rev_%4.4x'%device.BCD).replace('a', ':') # Bug in winutil.get_usb_devices converts a to :
+                if vid in device_id and pid in device_id and rev in device_id:
                     return True
             return False
         else:
diff --git a/src/calibre/ebooks/epub/__init__.py b/src/calibre/ebooks/epub/__init__.py
index a64dd43ac3..f1a60ab646 100644
--- a/src/calibre/ebooks/epub/__init__.py
+++ b/src/calibre/ebooks/epub/__init__.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env  python
+from __future__ import with_statement
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
@@ -6,10 +6,12 @@ __docformat__ = 'restructuredtext en'
 '''
 Conversion to EPUB.
 '''
-import sys, textwrap, re
+import sys, textwrap, re, os, uuid
+from itertools import cycle
 from calibre.utils.config import Config, StringConfig
 from calibre.utils.zipfile import ZipFile, ZIP_STORED
 from calibre.ebooks.html import config as common_config, tostring
+from lxml import etree
 
 class DefaultProfile(object):
     
@@ -36,6 +38,38 @@ def rules(stylesheets):
                 if r.type == r.STYLE_RULE:
                     yield r
 
+def decrypt_font(key, path):
+    raw = open(path, 'rb').read()
+    crypt = raw[:1024]
+    key = cycle(iter(key))
+    decrypt = ''.join([chr(ord(x)^key.next()) for x in crypt])
+    with open(path, 'wb') as f:
+        f.write(decrypt)
+        f.write(raw[1024:])
+
+def process_encryption(encfile, opf):
+    key = None
+    m = re.search(r'(?i)(urn:uuid:[0-9a-f-]+)', open(opf, 'rb').read())
+    if m:
+        key = m.group(1)
+        key = list(map(ord, uuid.UUID(key).bytes))
+    try:
+        root = etree.parse(encfile)
+        for em in root.xpath('descendant::*[contains(name(), "EncryptionMethod")]'):
+            algorithm = em.get('Algorithm', '')
+            if algorithm != 'http://ns.adobe.com/pdf/enc#RC':
+                return False
+            cr = em.getparent().xpath('descendant::*[contains(name(), "CipherReference")]')[0]
+            uri = cr.get('URI')
+            path = os.path.abspath(os.path.join(os.path.dirname(encfile), '..', *uri.split('/')))
+            if os.path.exists(path):
+                decrypt_font(key, path)
+        return True
+    except:
+        import traceback
+        traceback.print_exc()
+    return False
+
 def initialize_container(path_to_container, opf_name='metadata.opf'):
     '''
     Create an empty EPUB document, with a default skeleton.
@@ -54,10 +88,10 @@ def initialize_container(path_to_container, opf_name='metadata.opf'):
     zf.writestr('META-INF/container.xml', CONTAINER)
     return zf
 
-def config(defaults=None):
+def config(defaults=None, name='epub'):
     desc = _('Options to control the conversion to EPUB')
     if defaults is None:
-        c = Config('epub', desc)
+        c = Config(name, desc)
     else:
         c = StringConfig(defaults, desc)
     
diff --git a/src/calibre/ebooks/epub/from_any.py b/src/calibre/ebooks/epub/from_any.py
index d86174f514..e204b38b03 100644
--- a/src/calibre/ebooks/epub/from_any.py
+++ b/src/calibre/ebooks/epub/from_any.py
@@ -12,12 +12,13 @@ from contextlib import nested
 
 from calibre import extract, walk
 from calibre.ebooks import DRMError
-from calibre.ebooks.epub import config as common_config
+from calibre.ebooks.epub import config as common_config, process_encryption
 from calibre.ebooks.epub.from_html import convert as html2epub, find_html_index
 from calibre.ptempfile import TemporaryDirectory
 from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.metadata.opf2 import OPFCreator
 from calibre.utils.zipfile import ZipFile
+from calibre.customize.ui import run_plugins_on_preprocess
 
 def lit2opf(path, tdir, opts):
     from calibre.ebooks.lit.reader import LitReader
@@ -30,7 +31,7 @@ def lit2opf(path, tdir, opts):
 
 def mobi2opf(path, tdir, opts):
     from calibre.ebooks.mobi.reader import MobiReader
-    print 'Exploding MOBI file:', path
+    print 'Exploding MOBI file:', path.encode('utf-8') if isinstance(path, unicode) else path
     reader = MobiReader(path)
     reader.extract_content(tdir)
     files = list(walk(tdir))
@@ -72,12 +73,19 @@ def epub2opf(path, tdir, opts):
     zf = ZipFile(path)
     zf.extractall(tdir)
     opts.chapter_mark = 'none'
-    if os.path.exists(os.path.join(tdir, 'META-INF', 'encryption.xml')):
-        raise DRMError(os.path.basename(path))
+    encfile = os.path.join(tdir, 'META-INF', 'encryption.xml')
+    opf = None
     for f in walk(tdir):
         if f.lower().endswith('.opf'):
-            return f
-    raise ValueError('%s is not a valid EPUB file'%path)
+            opf = f
+            break
+    if opf and os.path.exists(encfile):
+        if not process_encryption(encfile, opf):
+            raise DRMError(os.path.basename(path))
+        
+    if opf is None:
+        raise ValueError('%s is not a valid EPUB file'%path)
+    return opf
     
 def odt2epub(path, tdir, opts):
     from calibre.ebooks.odt.to_oeb import Extract
@@ -109,7 +117,9 @@ def unarchive(path, tdir):
                 return f, ext
     return find_html_index(files)
 
-def any2epub(opts, path, notification=None):
+def any2epub(opts, path, notification=None, create_epub=True, 
+             oeb_cover=False, extract_to=None):
+    path = run_plugins_on_preprocess(path)
     ext = os.path.splitext(path)[1]
     if not ext:
         raise ValueError('Unknown file type: '+path)
@@ -132,7 +142,9 @@ def any2epub(opts, path, notification=None):
             raise ValueError('Conversion from %s is not supported'%ext.upper())
         
         print 'Creating EPUB file...'
-        html2epub(path, opts, notification=notification)
+        html2epub(path, opts, notification=notification, 
+                  create_epub=create_epub, oeb_cover=oeb_cover,
+                  extract_to=extract_to)
 
 def config(defaults=None):
     return common_config(defaults=defaults)
@@ -141,14 +153,14 @@ def config(defaults=None):
 def formats():
     return ['html', 'rar', 'zip', 'oebzip']+list(MAP.keys())
 
-def option_parser():
-    
-    return config().option_parser(usage=_('''\
+USAGE = _('''\
 %%prog [options] filename
 
-Convert any of a large number of ebook formats to an epub file. Supported formats are: %s
-''')%formats()
-)
+Convert any of a large number of ebook formats to a %s file. Supported formats are: %s
+''')
+
+def option_parser(usage=USAGE):
+    return config().option_parser(usage=usage%('EPUB', formats()))
 
 def main(args=sys.argv):
     parser = option_parser()
diff --git a/src/calibre/ebooks/epub/from_html.py b/src/calibre/ebooks/epub/from_html.py
index a5e5f51004..9165e99313 100644
--- a/src/calibre/ebooks/epub/from_html.py
+++ b/src/calibre/ebooks/epub/from_html.py
@@ -32,14 +32,15 @@ Conversion of HTML/OPF files follows several stages:
     * The EPUB container is created.
 '''
 
-import os, sys, cStringIO, logging, re
+import os, sys, cStringIO, logging, re, functools, shutil
 
 from lxml.etree import XPath
+from lxml import html, etree
 from PyQt4.Qt import QApplication, QPixmap
 
 from calibre.ebooks.html import Processor, merge_metadata, get_filelist,\
-    opf_traverse, create_metadata, rebase_toc
-from calibre.ebooks.epub import config as common_config
+    opf_traverse, create_metadata, rebase_toc, Link, parser
+from calibre.ebooks.epub import config as common_config, tostring
 from calibre.ptempfile import TemporaryDirectory
 from calibre.ebooks.metadata.toc import TOC
 from calibre.ebooks.metadata.opf2 import OPF
@@ -47,7 +48,46 @@ from calibre.ebooks.epub import initialize_container, PROFILES
 from calibre.ebooks.epub.split import split
 from calibre.ebooks.epub.fonts import Rationalizer
 from calibre.constants import preferred_encoding
-from calibre import walk
+from calibre.customize.ui import run_plugins_on_postprocess
+from calibre import walk, CurrentDir, to_unicode
+
+content = functools.partial(os.path.join, u'content')
+
+def remove_bad_link(element, attribute, link, pos):
+    if attribute is not None:
+        if element.tag in ['link']:
+            element.getparent().remove(element)
+        else:
+            element.set(attribute, '')
+            del element.attrib[attribute]
+
+def check_links(opf_path, pretty_print):
+    '''
+    Find and remove all invalid links in the HTML files 
+    '''
+    logger = logging.getLogger('html2epub')
+    logger.info('\tChecking files for bad links...')
+    pathtoopf = os.path.abspath(opf_path)
+    with CurrentDir(os.path.dirname(pathtoopf)):
+        opf = OPF(open(pathtoopf, 'rb'), os.path.dirname(pathtoopf))
+        html_files = []
+        for item in opf.itermanifest():
+            if 'html' in item.get('media-type', '').lower():
+                f = item.get('href').split('/')[-1].decode('utf-8')
+                html_files.append(os.path.abspath(content(f)))
+        
+        for path in html_files:
+            base = os.path.dirname(path)
+            root = html.fromstring(open(content(path), 'rb').read(), parser=parser)
+            for element, attribute, link, pos in list(root.iterlinks()):
+                link = to_unicode(link)
+                plink = Link(link, base)
+                bad = False
+                if plink.path is not None and not os.path.exists(plink.path):
+                    bad = True
+                if bad:
+                    remove_bad_link(element, attribute, link, pos)
+            open(content(path), 'wb').write(tostring(root, pretty_print))
 
 def find_html_index(files):
     '''
@@ -83,6 +123,10 @@ class HTMLProcessor(Processor, Rationalizer):
         if opts.verbose > 2:
             self.debug_tree('nocss')
             
+        if hasattr(self.body, 'xpath'):
+            for script in list(self.body.xpath('descendant::script')):
+                script.getparent().remove(script)
+            
     def convert_image(self, img):
         rpath = img.get('src', '')
         path = os.path.join(os.path.dirname(self.save_path()), *rpath.split('/'))
@@ -165,23 +209,22 @@ TITLEPAGE = '''\
     </head>
     <body>
         <div>
-            <img src="%s" alt="cover" />
+            <img src="%s" alt="cover" style="height: 100%%" />
         </div>
     </body>
 </html>
 '''
 
-def create_cover_image(src, dest, screen_size):
-    from PyQt4.Qt import QApplication, QImage, Qt
-    if QApplication.instance() is None:
-        app = QApplication([])
-        app
-    im = QImage()
+def create_cover_image(src, dest, screen_size, rescale_cover=True):
     try:
+        from PyQt4.Qt import QImage, Qt
+        if QApplication.instance() is None:
+            QApplication([])
+        im = QImage()
         im.load(src)
         if im.isNull():
-            raise ValueError
-        if screen_size is not None:
+            raise ValueError('Invalid cover image')
+        if rescale_cover and screen_size is not None:
             width, height = im.width(), im.height()
             dw, dh = (screen_size[0]-width)/float(width), (screen_size[1]-height)/float(height)
             delta = min(dw, dh)
@@ -189,7 +232,7 @@ def create_cover_image(src, dest, screen_size):
                 nwidth = int(width + delta*(width))
                 nheight = int(height + delta*(height))
                 im = im.scaled(int(nwidth), int(nheight), Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
-            im.save(dest)
+        im.save(dest)
     except:
         import traceback
         traceback.print_exc()
@@ -202,7 +245,6 @@ def process_title_page(mi, filelist, htmlfilemap, opts, tdir):
     if mi.cover:
         if f(filelist[0].path) == f(mi.cover):
             old_title_page = htmlfilemap[filelist[0].path]
-            
     #logger = logging.getLogger('html2epub')
     metadata_cover = mi.cover
     if metadata_cover and not os.path.exists(metadata_cover):
@@ -211,14 +253,15 @@ def process_title_page(mi, filelist, htmlfilemap, opts, tdir):
     cpath = '/'.join(('resources', '_cover_.jpg'))
     cover_dest = os.path.join(tdir, 'content', *cpath.split('/'))
     if metadata_cover is not None:
-        if not create_cover_image(metadata_cover, cover_dest, opts.profile.screen_size):
+        if not create_cover_image(metadata_cover, cover_dest, 
+                                  opts.profile.screen_size):
             metadata_cover = None
-                
     specified_cover = opts.cover
     if specified_cover and not os.path.exists(specified_cover):
         specified_cover = None
     if specified_cover is not None:
-        if not create_cover_image(specified_cover, cover_dest, opts.profile.screen_size):
+        if not create_cover_image(specified_cover, cover_dest, 
+                                  opts.profile.screen_size):
             specified_cover = None
             
     cover = metadata_cover if specified_cover is None or (opts.prefer_metadata_cover and metadata_cover is not None) else specified_cover
@@ -233,9 +276,26 @@ def process_title_page(mi, filelist, htmlfilemap, opts, tdir):
     elif os.path.exists(cover_dest):
         os.remove(cover_dest)
     return None, old_title_page is not None
-    
 
-def convert(htmlfile, opts, notification=None):
+def find_oeb_cover(htmlfile):
+    if os.stat(htmlfile).st_size > 2048:
+        return None
+    match = re.search(r'(?i)<img[^<>]+src\s*=\s*[\'"](.+?)[\'"]', open(htmlfile, 'rb').read())
+    if match:
+        return match.group(1)
+
+def condense_ncx(ncx_path):
+    tree = etree.parse(ncx_path)
+    for tag in tree.getroot().iter(tag=etree.Element):
+        if tag.text:
+            tag.text = tag.text.strip()
+        if tag.tail:
+            tag.tail = tag.tail.strip()
+    compressed = etree.tostring(tree.getroot(), encoding='utf-8')
+    open(ncx_path, 'wb').write(compressed)
+
+def convert(htmlfile, opts, notification=None, create_epub=True, 
+            oeb_cover=False, extract_to=None):
     htmlfile = os.path.abspath(htmlfile)
     if opts.output is None:
         opts.output = os.path.splitext(os.path.basename(htmlfile))[0] + '.epub'
@@ -287,7 +347,7 @@ def convert(htmlfile, opts, notification=None):
         
         title_page, has_title_page = process_title_page(mi, filelist, htmlfile_map, opts, tdir)
         spine = [htmlfile_map[f.path] for f in filelist]
-        if title_page is not None:
+        if not oeb_cover and title_page is not None:
             spine = [title_page] + spine
         mi.cover = None
         mi.cover_data = (None, None)
@@ -316,26 +376,55 @@ def convert(htmlfile, opts, notification=None):
             if opts.show_ncx:
                 print toc
         split(opf_path, opts, stylesheet_map)
+        check_links(opf_path, opts.pretty_print)
+        
         opf = OPF(opf_path, tdir)
         opf.remove_guide()
-        if has_title_page:
+        oeb_cover_file = None
+        if oeb_cover and title_page is not None:
+            oeb_cover_file = find_oeb_cover(os.path.join(tdir, 'content', title_page))
+        if has_title_page or (oeb_cover and oeb_cover_file):
             opf.create_guide_element()
-            opf.add_guide_item('cover', 'Cover', 'content/'+spine[0])
+            if has_title_page and not oeb_cover:
+                opf.add_guide_item('cover', 'Cover', 'content/'+spine[0])
+            if oeb_cover and oeb_cover_file:
+                opf.add_guide_item('cover', 'Cover', 'content/'+oeb_cover_file)
         
-        opf.add_path_to_manifest(os.path.join(tdir, 'content', 'resources', '_cover_.jpg'), 'image/jpeg')    
+        cpath = os.path.join(tdir, 'content', 'resources', '_cover_.jpg')
+        if os.path.exists(cpath):
+            opf.add_path_to_manifest(cpath, 'image/jpeg')    
         with open(opf_path, 'wb') as f:
             raw = opf.render()
             if not raw.startswith('<?xml '):
                 raw = '<?xml version="1.0"  encoding="UTF-8"?>\n'+raw
             f.write(raw)
-        epub = initialize_container(opts.output)
-        epub.add_dir(tdir)
+        ncx_path = os.path.join(os.path.dirname(opf_path), 'toc.ncx')
+        if os.path.exists(ncx_path) and os.stat(ncx_path).st_size > opts.profile.flow_size:
+            logger.info('Condensing NCX from %d bytes...'%os.stat(ncx_path).st_size)
+            condense_ncx(ncx_path)
+            if os.stat(ncx_path).st_size > opts.profile.flow_size:
+                logger.warn('NCX still larger than allowed size at %d bytes. Menu based Table of Contents may not work on device.'%os.stat(ncx_path).st_size)
+            
+        if create_epub:
+            epub = initialize_container(opts.output)
+            epub.add_dir(tdir)
+            epub.close()
+            run_plugins_on_postprocess(opts.output, 'epub')
+            logger.info(_('Output written to ')+opts.output)
+        
         if opts.show_opf:
             print open(os.path.join(tdir, 'metadata.opf')).read()
-        logger.info('Output written to %s'%opts.output)
+        
         if opts.extract_to is not None:
-            epub.extractall(opts.extract_to)
-        epub.close()
+            if os.path.exists(opts.extract_to):
+                shutil.rmtree(opts.extract_to)
+            shutil.copytree(tdir, opts.extract_to)
+            
+        if extract_to is not None:
+            if os.path.exists(extract_to):
+                shutil.rmtree(extract_to)
+            shutil.copytree(tdir, extract_to)
+            
         
             
 def main(args=sys.argv):
diff --git a/src/calibre/ebooks/epub/iterator.py b/src/calibre/ebooks/epub/iterator.py
index 4dd7fe1cc8..08c275e81f 100644
--- a/src/calibre/ebooks/epub/iterator.py
+++ b/src/calibre/ebooks/epub/iterator.py
@@ -37,14 +37,16 @@ class UnsupportedFormatError(Exception):
 
 class SpineItem(unicode):
     
-    def __init__(self, path):
-        unicode.__init__(self, path)
+    def __new__(cls, *args):
+        obj = super(SpineItem, cls).__new__(cls, *args)
+        path = args[0]
         raw = open(path, 'rb').read()
-        raw, self.encoding = xml_to_unicode(raw)
-        self.character_count = character_count(raw)
-        self.start_page = -1
-        self.pages      = -1
-        self.max_page   = -1
+        raw, obj.encoding = xml_to_unicode(raw)
+        obj.character_count = character_count(raw)
+        obj.start_page = -1
+        obj.pages      = -1
+        obj.max_page   = -1
+        return obj
 
 def html2opf(path, tdir, opts):
     opts = copy.copy(opts)
@@ -166,8 +168,12 @@ class EbookIterator(object):
         if bookmarks is None:
             bookmarks = self.bookmarks
         dat = self.serialize_bookmarks(bookmarks)
-        if os.path.splitext(self.pathtoebook)[1].lower() == '.epub':
-            zf = open(self.pathtoebook, 'r+b')
+        if os.path.splitext(self.pathtoebook)[1].lower() == '.epub' and \
+            os.access(self.pathtoebook, os.R_OK):
+            try:
+                zf = open(self.pathtoebook, 'r+b')
+            except IOError:
+                return
             zipf = ZipFile(zf, mode='a')
             for name in zipf.namelist():
                 if name == 'META-INF/calibre_bookmarks.txt':
diff --git a/src/calibre/ebooks/epub/split.py b/src/calibre/ebooks/epub/split.py
index f4847df578..ed2a78826f 100644
--- a/src/calibre/ebooks/epub/split.py
+++ b/src/calibre/ebooks/epub/split.py
@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 Split the flows in an epub file to conform to size limitations.
 '''
 
-import os, math, logging, functools, collections, re, copy
+import os, math, logging, functools, collections, re, copy, sys
 
 from lxml.etree import XPath as _XPath
 from lxml import etree, html
@@ -34,29 +34,61 @@ class SplitError(ValueError):
 
 class Splitter(LoggingInterface):
     
-    def __init__(self, path, opts, stylesheet_map, always_remove=False):
+    def __init__(self, path, opts, stylesheet_map, opf):
         LoggingInterface.__init__(self, logging.getLogger('htmlsplit'))
         self.setup_cli_handler(opts.verbose)
         self.path = path
-        self.always_remove = always_remove
+        self.always_remove = not opts.preserve_tag_structure or \
+                    os.stat(content(path)).st_size > 5*opts.profile.flow_size
         self.base = (os.path.splitext(path)[0].replace('%', '%%') + '_split_%d.html')
         self.opts = opts
         self.orig_size = os.stat(content(path)).st_size
         self.log_info('\tSplitting %s (%d KB)', path, self.orig_size/1024.)
         root = html.fromstring(open(content(path)).read())
             
-        self.page_breaks = []
-        self.find_page_breaks(stylesheet_map[self.path], root)
-            
-        self.trees = []
+        self.page_breaks, self.trees = [], []
         self.split_size = 0
-        self.split(root.getroottree())
-        self.commit()
-        self.log_info('\t\tSplit into %d parts.', len(self.trees))
-        if self.opts.verbose:
-            for f in self.files:
-                self.log_info('\t\t\t%s - %d KB', f, os.stat(content(f)).st_size/1024.)
+        
+        # Split on page breaks
+        self.log_info('\tSplitting on page breaks...')
+        if self.path in stylesheet_map:
+            self.find_page_breaks(stylesheet_map[self.path], root)
+        self.split_on_page_breaks(root.getroottree())
+        trees = list(self.trees)
+        
+        # Split any remaining over-sized trees
+        if self.opts.profile.flow_size < sys.maxint:
+            lt_found = False
+            self.log_info('\tLooking for large trees...')
+            for i, tree in enumerate(list(trees)):
+                self.trees = []
+                size = len(tostring(tree.getroot())) 
+                if size > self.opts.profile.flow_size:
+                    lt_found = True
+                    try:
+                        self.split_to_size(tree)
+                    except (SplitError, RuntimeError): # Splitting fails
+                        if not self.always_remove:
+                            self.always_remove = True
+                            self.split_to_size(tree)
+                        else:
+                            raise
+                    trees[i:i+1] = list(self.trees)
+            if not lt_found:
+                self.log_info('\tNo large trees found')
+        
+        self.trees = trees
+        self.was_split = len(self.trees) > 1
+        if self.was_split:
+            self.commit()
+            self.log_info('\t\tSplit into %d parts.', len(self.trees))
+            if self.opts.verbose:
+                for f in self.files:
+                    self.log_info('\t\t\t%s - %d KB', f, os.stat(content(f)).st_size/1024.)
+            self.fix_opf(opf)
+            
         self.trees = None
+        
     
     def split_text(self, text, root, size):
         self.log_debug('\t\t\tSplitting text of length: %d'%len(text))
@@ -76,12 +108,7 @@ class Splitter(LoggingInterface):
         return ans
             
     
-    def split(self, tree):
-        '''
-        Split ``tree`` into a *before* and *after* tree, preserving tag structure,
-        but not duplicating any text. All tags that have had their text and tail
-        removed have the attribute ``calibre_split`` set to 1.
-        '''
+    def split_to_size(self, tree):
         self.log_debug('\t\tSplitting...')
         root = tree.getroot()
         # Split large <pre> tags
@@ -108,10 +135,50 @@ class Splitter(LoggingInterface):
             if not self.always_remove:
                 self.log_warn(_('\t\tToo much markup. Re-splitting without structure preservation. This may cause incorrect rendering.'))
             raise SplitError(self.path, root)
-        tree2 = copy.deepcopy(tree)
-        root2 = tree2.getroot()
-        body, body2 = root.body, root2.body
-        path = tree.getpath(split_point)
+        
+        for t in self.do_split(tree, split_point, before):
+            r = t.getroot()
+            if self.is_page_empty(r):
+                continue
+            size = len(tostring(r))
+            if size <= self.opts.profile.flow_size:
+                self.trees.append(t)
+                #print tostring(t.getroot(), pretty_print=True)
+                self.log_debug('\t\t\tCommitted sub-tree #%d (%d KB)', len(self.trees), size/1024.)
+                self.split_size += size
+            else:
+                self.split_to_size(t)
+    
+    def is_page_empty(self, root):
+        body = root.find('body')
+        if body is None:
+            return False
+        txt = re.sub(r'\s+', '', html.tostring(body, method='text', encoding=unicode))
+        if len(txt) > 4:
+            #if len(txt) < 100:
+            #    print 1111111, html.tostring(body, method='html', encoding=unicode)
+            return False
+        for img in root.xpath('//img'):
+            if img.get('style', '') != 'display:none':
+                return False
+        return True
+                
+    def do_split(self, tree, split_point, before):
+        '''
+        Split ``tree`` into a *before* and *after* tree at ``split_point``, 
+        preserving tag structure, but not duplicating any text. 
+        All tags that have had their text and tail
+        removed have the attribute ``calibre_split`` set to 1.
+        
+        :param before: If True tree is split before split_point, otherwise after split_point
+        :return: before_tree, after_tree
+        '''
+        path         = tree.getpath(split_point)
+        tree, tree2  = copy.deepcopy(tree), copy.deepcopy(tree)
+        root         = tree.getroot()
+        root2        = tree2.getroot()
+        body, body2  = root.body, root2.body
+        split_point  = root.xpath(path)[0]
         split_point2 = root2.xpath(path)[0]
         
         def nix_element(elem, top=True):
@@ -129,7 +196,7 @@ class Splitter(LoggingInterface):
                 elem.tail = u''
                 elem.set(SPLIT_ATTR, '1')
                 if elem.tag.lower() in ['ul', 'ol', 'dl', 'table', 'hr', 'img']:
-                    elem.set('style', 'display:none;')
+                    elem.set('style', 'display:none')
         
         def fix_split_point(sp):
             sp.set('style', sp.get('style', '')+'page-break-before:avoid;page-break-after:avoid') 
@@ -163,20 +230,35 @@ class Splitter(LoggingInterface):
             if not hit_split_point:
                 nix_element(elem, top=False)
         
-        for t, r in [(tree, root), (tree2, root2)]:
-            size = len(tostring(r)) 
-            if size <= self.opts.profile.flow_size:
-                self.trees.append(t)
-                #print tostring(t.getroot(), pretty_print=True)
-                self.log_debug('\t\t\tCommitted sub-tree #%d (%d KB)', len(self.trees), size/1024.)
-                self.split_size += size
-            else:
-                self.split(t)
+        return tree, tree2
                 
+    
+    def split_on_page_breaks(self, orig_tree):
+        ordered_ids = []
+        for elem in orig_tree.xpath('//*[@id]'):
+            id = elem.get('id')
+            if id in self.page_break_ids:
+                ordered_ids.append(self.page_breaks[self.page_break_ids.index(id)])
+                
+        self.trees = []
+        tree = orig_tree
+        for pattern, before in ordered_ids:
+            self.log_info('\t\tSplitting on page-break')
+            elem = pattern(tree)
+            if elem:
+                before, after = self.do_split(tree, elem[0], before)
+                self.trees.append(before)
+                tree = after
+        self.trees.append(tree)
+        self.trees = [t for t in self.trees if not self.is_page_empty(t.getroot())]
+                
+            
                 
     def find_page_breaks(self, stylesheets, root):
         '''
         Find all elements that have either page-break-before or page-break-after set.
+        Populates `self.page_breaks` with id based XPath selectors (for elements that don't 
+        have ids, an id is created).
         '''
         page_break_selectors = set([])
         for rule in rules(stylesheets):
@@ -204,16 +286,18 @@ class Splitter(LoggingInterface):
             
         page_breaks = list(page_breaks)
         page_breaks.sort(cmp=lambda x,y : cmp(x.pb_order, y.pb_order))
+        self.page_break_ids = []
         for i, x in enumerate(page_breaks):
             x.set('id', x.get('id', 'calibre_pb_%d'%i))
-            self.page_breaks.append((XPath('//*[@id="%s"]'%x.get('id')), x.pb_before))
+            id = x.get('id')
+            self.page_breaks.append((XPath('//*[@id="%s"]'%id), x.pb_before))
+            self.page_break_ids.append(id)                        
         
         
     def find_split_point(self, root):
         '''
         Find the tag at which to split the tree rooted at `root`. 
         Search order is:
-            * page breaks
             * Heading tags
             * <div> tags
             * <p> tags
@@ -229,19 +313,6 @@ class Splitter(LoggingInterface):
                     elems[i].set(SPLIT_POINT_ATTR, '1')
                     return elems[i]
     
-        page_breaks = []
-        for x in self.page_breaks:
-            pb = x[0](root)
-            if pb:
-                page_breaks.append(pb[0])
-        
-        elem = pick_elem(page_breaks)
-        if elem is not None:
-            i = page_breaks.index(elem)
-            return elem, self.page_breaks[i][1]
-        
-            
-                            
         for path in (
                      '//*[re:match(name(), "h[1-6]", "i")]', 
                      '/html/body/div',
@@ -315,6 +386,9 @@ class Splitter(LoggingInterface):
                 frag = None
                 if len(href) > 1:
                     frag = href[1]
+                if frag not in self.anchor_map:
+                    self.log_warning('\t\tUnable to re-map OPF link', href)
+                    continue
                 new_file = self.anchor_map[frag]
                 ref.set('href', 'content/'+new_file+('' if frag is None else ('#'+frag)))
 
@@ -341,7 +415,11 @@ def fix_content_links(html_files, changes, opts):
                 anchor = href[1] if len(href) > 1 else None
                 href = href[0]
                 if href in split_files:
-                    newf = anchor_maps[split_files.index(href)][anchor]
+                    try:
+                        newf = anchor_maps[split_files.index(href)][anchor]
+                    except:
+                        print '\t\tUnable to remap HTML link:', href, anchor
+                        continue
                     frag = ('#'+anchor) if anchor else ''
                     a.set('href', newf+frag)
                     changed = True
@@ -354,52 +432,54 @@ def fix_ncx(path, changes):
     anchor_maps = [f.anchor_map for f in changes]
     tree = etree.parse(path)
     changed = False
-    for content in tree.getroot().xpath('//x:content[@src]', namespaces={'x':"http://www.daisy.org/z3986/2005/ncx/"}):
+    for content in tree.getroot().xpath('//x:content[@src]', 
+                    namespaces={'x':"http://www.daisy.org/z3986/2005/ncx/"}):
         href = content.get('src')
         if not href.startswith('#'):
             href = href.split('#')
             anchor = href[1] if len(href) > 1 else None
             href = href[0].split('/')[-1]
             if href in split_files:
-                newf = anchor_maps[split_files.index(href)][anchor]
+                try:
+                    newf = anchor_maps[split_files.index(href)][anchor]
+                except:
+                    print 'Unable to remap NCX link:', href, anchor
                 frag = ('#'+anchor) if anchor else ''
                 content.set('src', 'content/'+newf+frag)
                 changed = True
     if changed:
         open(path, 'wb').write(etree.tostring(tree.getroot(), encoding='UTF-8', xml_declaration=True))
-       
+
+def find_html_files(opf):
+    '''
+    Find all HTML files referenced by `opf`.
+    '''
+    html_files = []
+    for item in opf.itermanifest():
+        if 'html' in item.get('media-type', '').lower():
+            f = item.get('href').split('/')[-1]
+            f2 = f.replace('&', '%26')
+            if not os.path.exists(content(f)) and os.path.exists(content(f2)):
+                f = f2
+                item.set('href', item.get('href').replace('&', '%26'))
+            if os.path.exists(content(f)):
+                html_files.append(f)
+    return html_files
+        
+
 def split(pathtoopf, opts, stylesheet_map):
     pathtoopf = os.path.abspath(pathtoopf)
+    opf = OPF(open(pathtoopf, 'rb'), os.path.dirname(pathtoopf))
+    
     with CurrentDir(os.path.dirname(pathtoopf)):
-        opf = OPF(open(pathtoopf, 'rb'), os.path.dirname(pathtoopf))
-        html_files = []
-        for item in opf.itermanifest():
-            if 'html' in item.get('media-type', '').lower():
-                f = item.get('href').split('/')[-1]
-                f2 = f.replace('&', '%26')
-                if not os.path.exists(content(f)) and os.path.exists(content(f2)):
-                    f = f2
-                    item.set('href', item.get('href').replace('&', '%26'))
-                html_files.append(f)
-        changes = []
-        always_remove = not opts.preserve_tag_structure
-        for f in html_files:
-            if os.stat(content(f)).st_size > opts.profile.flow_size:
-                try:
-                    changes.append(Splitter(f, opts, stylesheet_map,
-                        always_remove=(always_remove or \
-                        os.stat(content(f)).st_size > 5*opts.profile.flow_size)))
-                except (SplitError, RuntimeError):
-                    if not always_remove:
-                        changes.append(Splitter(f, opts, stylesheet_map, always_remove=True))
-                    else:
-                        raise
-                changes[-1].fix_opf(opf)
+        html_files = find_html_files(opf)
+        changes = [Splitter(f, opts, stylesheet_map, opf) for f in html_files]
+        changes = [c for c in changes if c.was_split]
         
-        open(pathtoopf, 'wb').write(opf.render())
         fix_content_links(html_files, changes, opts)
-        
         for item in opf.itermanifest():
             if item.get('media-type', '') == 'application/x-dtbncx+xml':
                 fix_ncx(item.get('href'), changes)
                 break 
+
+        open(pathtoopf, 'wb').write(opf.render())
diff --git a/src/calibre/ebooks/html.py b/src/calibre/ebooks/html.py
index c811982184..84af7527bd 100644
--- a/src/calibre/ebooks/html.py
+++ b/src/calibre/ebooks/html.py
@@ -314,10 +314,22 @@ def opf_traverse(opf_reader, verbose=0, encoding=None):
             
 
 convert_entities = functools.partial(entity_to_unicode, exceptions=['quot', 'apos', 'lt', 'gt', 'amp'])
+_span_pat = re.compile('<span.*?</span>', re.DOTALL|re.IGNORECASE)
+
+def sanitize_head(match):
+    x = match.group(1)
+    x = _span_pat.sub('', x)
+    return '<head>\n'+x+'\n</head>'
+    
 class PreProcessor(object):
     PREPROCESS = [
+                  # Some idiotic HTML generators (Frontpage I'm looking at you)
+                  # Put all sorts of crap into <head>. This messes up lxml
+                  (re.compile(r'<head[^>]*>(.*?)</head>', re.IGNORECASE|re.DOTALL), 
+                   sanitize_head),
                   # Convert all entities, since lxml doesn't handle them well
                   (re.compile(r'&(\S+?);'), convert_entities),
+                  
                   ]
                      
     # Fix pdftohtml markup
@@ -446,7 +458,10 @@ class Parser(PreProcessor, LoggingInterface):
     def parse_html(self):
         ''' Create lxml ElementTree from HTML '''
         self.log_info('\tParsing '+os.sep.join(self.htmlfile.path.split(os.sep)[-3:]))
+        if self.htmlfile.is_binary:
+            raise ValueError('Not a valid HTML file: '+self.htmlfile.path)
         src = open(self.htmlfile.path, 'rb').read().decode(self.htmlfile.encoding, 'replace').strip()
+        src = src.replace('\x00', '')
         src = self.preprocess(src)
         # lxml chokes on unicode input when it contains encoding declarations
         for pat in ENCODING_PATS:
@@ -527,6 +542,7 @@ class Processor(Parser):
     
     LINKS_PATH = XPath('//a[@href]')
     PIXEL_PAT  = re.compile(r'([-]?\d+|[-]?\d*\.\d+)px')
+    PAGE_PAT   = re.compile(r'@page[^{]*?{[^}]*?}')
     
     def __init__(self, *args, **kwargs):
         Parser.__init__(self, *args, **kwargs)
@@ -696,7 +712,9 @@ class Processor(Parser):
                 return ''
             return '%fpt'%(72 * val/dpi)
         
-        return cls.PIXEL_PAT.sub(rescale, css)
+        css = cls.PIXEL_PAT.sub(rescale, css)
+        css = cls.PAGE_PAT.sub('', css)
+        return css
         
     def extract_css(self, parsed_sheets):
         '''
@@ -732,7 +750,12 @@ class Processor(Parser):
                             self.log_error('Failed to open stylesheet: %s'%file)
                         else:
                             try:
-                                parsed_sheets[file] = self.css_parser.parseString(css)
+                                try:
+                                    parsed_sheets[file] = self.css_parser.parseString(css)
+                                except ValueError:
+                                    parsed_sheets[file] = \
+                                        self.css_parser.parseString(\
+                                                css.decode('utf8', 'replace'))
                             except:
                                 parsed_sheets[file] = css.decode('utf8', 'replace')
                                 self.log_warning('Failed to parse stylesheet: %s'%file)
@@ -762,10 +785,15 @@ class Processor(Parser):
         class_counter = 0
         for font in self.root.xpath('//font'):
             try:
-                size = int(font.attrib.pop('size', '3'))
+                size = font.attrib.pop('size', '3')
             except:
-                size = 3
-            setting = 'font-size: %d%%;'%int((float(size)/3) * 100)
+                size = '3'
+            if size and size.strip() and size.strip()[0] in ('+', '-'):
+                size = 3 + float(size) # Hack assumes basefont=3
+            try:
+                setting = 'font-size: %d%%;'%int((float(size)/3) * 100)
+            except ValueError:
+                setting = ''
             face = font.attrib.pop('face', None)
             if face is not None:
                 setting += 'font-face:%s;'%face
@@ -798,16 +826,17 @@ class Processor(Parser):
         
         css = '\n'.join(['.%s {%s;}'%(cn, setting) for \
                          setting, cn in cache.items()])
-        sheet = self.css_parser.parseString(self.preprocess_css(css))
+        sheet = self.css_parser.parseString(self.preprocess_css(css.replace(';;}', ';}')))
         for rule in sheet:
             self.stylesheet.add(rule)
         css = ''
         css += '\n\n' + 'body {margin-top: 0pt; margin-bottom: 0pt; margin-left: 0pt; margin-right: 0pt;}'
-        css += '\n\n@page {margin-top: %fpt; margin-bottom: %fpt; margin-left: %fpt; margin-right: %fpt}'%(self.opts.margin_top, self.opts.margin_bottom, self.opts.margin_left, self.opts.margin_right)
+        css += '\n\n@page {margin-top: %fpt; margin-bottom: %fpt; }'%(self.opts.margin_top, self.opts.margin_bottom)
+        css += '\n\nbody {margin-left: %fpt; margin-right: %fpt}'%(self.opts.margin_left, self.opts.margin_right)
         # Workaround for anchor rendering bug in ADE
         css += '\n\na { color: inherit; text-decoration: inherit; cursor: default; }\na[href] { color: blue; text-decoration: underline; cursor:pointer; }'
         if self.opts.remove_paragraph_spacing:
-            css += '\n\np {text-indent: 2em; margin-top:1pt; margin-bottom:1pt; padding:0pt; border:0pt;}'
+            css += '\n\np {text-indent: 2em; margin-top:0pt; margin-bottom:0pt; padding:0pt; border:0pt;}'
         if self.opts.override_css:
             css += '\n\n' + self.opts.override_css
         self.override_css = self.css_parser.parseString(self.preprocess_css(css))
@@ -863,7 +892,7 @@ def option_parser():
 %prog [options] file.html|opf
 
 Follow all links in an HTML file and collect them into the specified directory.
-Also collects any references resources like images, stylesheets, scripts, etc. 
+Also collects any resources like images, stylesheets, scripts, etc. 
 If an OPF file is specified instead, the list of files in its <spine> element
 is used.
 '''))
@@ -1042,11 +1071,12 @@ def main(args=sys.argv):
         
     return 0
 
-def gui_main(htmlfile):
+def gui_main(htmlfile, pt=None):
     '''
     Convenience wrapper for use in recursively importing HTML files.
     '''
-    pt = PersistentTemporaryFile('_html2oeb_gui.oeb.zip')
+    if pt is None:
+        pt = PersistentTemporaryFile('_html2oeb_gui.oeb.zip')
     pt.close()
     opts = '''
 pretty_print = True
diff --git a/src/calibre/ebooks/lit/from_any.py b/src/calibre/ebooks/lit/from_any.py
new file mode 100644
index 0000000000..cd8b5a115c
--- /dev/null
+++ b/src/calibre/ebooks/lit/from_any.py
@@ -0,0 +1,59 @@
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+'''
+Convert any ebook format to LIT.
+'''
+
+import sys, os, glob, logging
+
+from calibre.ebooks.epub.from_any import any2epub, formats, USAGE
+from calibre.ebooks.epub import config as common_config
+from calibre.ptempfile import TemporaryDirectory
+from calibre.ebooks.lit.writer import oeb2lit
+
+def config(defaults=None):
+    c = common_config(defaults=defaults, name='lit')
+    return c
+
+def option_parser(usage=USAGE):
+    return config().option_parser(usage=usage%('LIT', formats()))
+
+def any2lit(opts, path):
+    ext = os.path.splitext(path)[1]
+    if not ext:
+        raise ValueError('Unknown file type: '+path)
+    ext = ext.lower()[1:]
+    
+    if opts.output is None:
+        opts.output = os.path.splitext(os.path.basename(path))[0]+'.lit'
+    
+    opts.output = os.path.abspath(opts.output)
+    orig_output = opts.output
+    
+    with TemporaryDirectory('_any2lit') as tdir:
+        oebdir = os.path.join(tdir, 'oeb')
+        os.mkdir(oebdir)
+        opts.output = os.path.join(tdir, 'dummy.epub')
+        opts.profile = 'None'
+        any2epub(opts, path, create_epub=False, oeb_cover=True, extract_to=oebdir)
+        opf = glob.glob(os.path.join(oebdir, '*.opf'))[0]
+        opts.output = orig_output
+        logging.getLogger('html2epub').info(_('Creating LIT file from EPUB...'))
+        oeb2lit(opts, opf)
+    
+
+def main(args=sys.argv):
+    parser = option_parser()
+    opts, args = parser.parse_args(args)
+    if len(args) < 2:
+        parser.print_help()
+        print 'No input file specified.'
+        return 1
+    any2lit(opts, args[1])
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
\ No newline at end of file
diff --git a/src/calibre/ebooks/lit/html.css b/src/calibre/ebooks/lit/html.css
new file mode 100644
index 0000000000..9401b19cf2
--- /dev/null
+++ b/src/calibre/ebooks/lit/html.css
@@ -0,0 +1,426 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Blake Ross <BlakeR1234@aol.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+@namespace url(http://www.w3.org/1999/xhtml); /* set default namespace to HTML */
+
+/* blocks */
+
+html, div, map, dt, isindex, form {
+  display: block;
+}
+
+body {
+  display: block;
+  margin: 8px;
+}
+
+p, dl, multicol {
+  display: block;
+  margin: 1em 0;
+}
+
+dd {
+  display: block;
+}
+
+blockquote {
+  display: block;
+  margin: 1em 40px;
+}
+
+address {
+  display: block;
+  font-style: italic;
+}
+
+center {
+  display: block;
+  text-align: center;
+}
+
+blockquote[type=cite] {
+  display: block;
+  margin: 1em 0px;
+  border-color: blue;
+  border-width: thin;
+}
+
+span[_moz_quote=true] {
+  color: blue;
+}
+
+pre[_moz_quote=true] {
+  color: blue;
+}
+
+h1 {
+  display: block;
+  font-size: 2em;
+  font-weight: bold;
+  margin: .67em 0;
+}
+
+h2 {
+  display: block;
+  font-size: 1.5em;
+  font-weight: bold;
+  margin: .83em 0;
+}
+
+h3 {
+  display: block;
+  font-size: 1.17em;
+  font-weight: bold;
+  margin: 1em 0;
+}
+
+h4 {
+  display: block;
+  font-weight: bold;
+  margin: 1.33em 0;
+}
+
+h5 {
+  display: block;
+  font-size: 0.83em;
+  font-weight: bold;
+  margin: 1.67em 0;
+}
+
+h6 {
+  display: block;
+  font-size: 0.67em;
+  font-weight: bold;
+  margin: 2.33em 0;
+}
+
+listing {
+  display: block;
+  font-family: monospace;
+  font-size: medium;
+  white-space: pre;
+  margin: 1em 0;
+}
+
+xmp, pre, plaintext {
+  display: block;
+  font-family: monospace;
+  white-space: pre;
+  margin: 1em 0;
+}
+
+/* tables */
+
+table {
+  display: table;
+  border-spacing: 2px;
+  border-collapse: separate;
+  margin-top: 0;
+  margin-bottom: 0;
+  text-indent: 0;
+}
+
+table[align="left"] {
+  float: left;
+}
+
+table[align="right"] {
+  float: right;
+}
+
+table[rules]:not([rules="none"]) {
+  border-collapse: collapse;
+}
+   
+/* caption inherits from table not table-outer */  
+caption {
+  display: table-caption;
+  text-align: center;
+}
+
+table[align="center"] > caption {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table[align="center"] > caption[align="left"] {
+  margin-right: 0;
+}
+
+table[align="center"] > caption[align="right"] {
+  margin-left: 0;
+}
+
+tr {
+  display: table-row;
+  vertical-align: inherit;
+}
+
+col {
+  display: table-column;
+}
+
+colgroup {
+  display: table-column-group;
+}
+
+tbody {
+  display: table-row-group;
+  vertical-align: middle;
+}
+
+thead {
+  display: table-header-group;
+  vertical-align: middle;
+}
+
+tfoot {
+  display: table-footer-group;
+  vertical-align: middle;
+}
+
+/* for XHTML tables without tbody */
+table > tr {
+  vertical-align: middle;
+}
+
+td { 
+  display: table-cell;
+  vertical-align: inherit;
+  text-align: inherit; 
+  padding: 1px;
+}
+
+th {
+  display: table-cell;
+  vertical-align: inherit;
+  font-weight: bold;
+  padding: 1px;
+}
+
+/* inlines */
+
+q:before {
+  content: open-quote;
+}
+
+q:after {
+  content: close-quote;
+}
+
+b, strong {
+  font-weight: bolder;
+}
+
+i, cite, em, var, dfn {
+  font-style: italic;
+}
+
+tt, code, kbd, samp {
+  font-family: monospace;
+}
+
+u, ins {
+  text-decoration: underline;
+}
+
+s, strike, del {
+  text-decoration: line-through;
+}
+
+blink {
+  text-decoration: blink;
+}
+
+big {
+  font-size: larger;
+}
+
+small {
+  font-size: smaller;
+}
+
+sub {
+  vertical-align: sub;
+  font-size: smaller;
+  line-height: normal;
+}
+
+sup {
+  vertical-align: super;
+  font-size: smaller;
+  line-height: normal;
+}
+
+nobr {
+  white-space: nowrap;
+}
+
+/* titles */
+abbr[title], acronym[title] {
+  border-bottom: dotted 1px;
+}
+
+/* lists */
+
+ul, menu, dir {
+  display: block;
+  list-style-type: disc;
+  margin: 1em 0;
+}
+
+ol {
+  display: block;
+  list-style-type: decimal;
+  margin: 1em 0;
+}
+
+li {
+  display: list-item;
+}
+
+/* nested lists have no top/bottom margins */
+ul ul,   ul ol,   ul dir,   ul menu,   ul dl,
+ol ul,   ol ol,   ol dir,   ol menu,   ol dl,
+dir ul,  dir ol,  dir dir,  dir menu,  dir dl,
+menu ul, menu ol, menu dir, menu menu, menu dl,
+dl ul,   dl ol,   dl dir,   dl menu,   dl dl {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* 2 deep unordered lists use a circle */
+ol ul,   ul ul,   menu ul,   dir ul,
+ol menu, ul menu, menu menu, dir menu,
+ol dir,  ul dir,  menu dir,  dir dir {
+  list-style-type: circle;
+}
+
+/* 3 deep (or more) unordered lists use a square */
+ol ol ul,     ol ul ul,     ol menu ul,     ol dir ul,
+ol ol menu,   ol ul menu,   ol menu menu,   ol dir menu,
+ol ol dir,    ol ul dir,    ol menu dir,    ol dir dir,
+ul ol ul,     ul ul ul,     ul menu ul,     ul dir ul,
+ul ol menu,   ul ul menu,   ul menu menu,   ul dir menu,
+ul ol dir,    ul ul dir,    ul menu dir,    ul dir dir,
+menu ol ul,   menu ul ul,   menu menu ul,   menu dir ul,
+menu ol menu, menu ul menu, menu menu menu, menu dir menu,
+menu ol dir,  menu ul dir,  menu menu dir,  menu dir dir,
+dir ol ul,    dir ul ul,    dir menu ul,    dir dir ul,
+dir ol menu,  dir ul menu,  dir menu menu,  dir dir menu,
+dir ol dir,   dir ul dir,   dir menu dir,   dir dir dir {
+  list-style-type: square;
+}
+
+
+/* leafs */
+
+/* <hr> noshade and color attributes are handled completely by
+ * the nsHTMLHRElement attribute mapping code
+ */
+hr {
+  display: block;
+  height: 2px;
+  border: 1px inset;
+  margin: 0.5em auto 0.5em auto;
+  color: gray;
+}
+
+hr[size="1"] {
+  border-style: solid none none none;
+}
+
+img[usemap], object[usemap] {
+  color: blue;
+}
+
+frameset {
+  display: block ! important;
+  position: static ! important;
+  float: none ! important;
+  border: none ! important;
+}
+
+frame {
+  border: none ! important;
+}
+
+iframe {
+  border: 2px inset;
+}
+
+noframes {
+  display: none;
+}
+
+spacer {
+  position: static ! important;
+  float: none ! important;
+}
+
+/* focusable content: anything w/ tabindex >=0 is focusable */
+abbr:focus, acronym:focus, address:focus, applet:focus, b:focus, 
+base:focus, big:focus, blockquote:focus, br:focus, canvas:focus, caption:focus,
+center:focus, cite:focus, code:focus, col:focus, colgroup:focus, dd:focus,
+del:focus, dfn:focus, dir:focus, div:focus, dl:focus, dt:focus, em:focus,
+fieldset:focus, font:focus, form:focus, h1:focus, h2:focus, h3:focus, h4:focus,
+h5:focus, h6:focus, hr:focus, i:focus, img:focus, ins:focus, 
+kbd:focus, label:focus, legend:focus, li:focus, link:focus, menu:focus, 
+object:focus, ol:focus, p:focus, pre:focus, q:focus, s:focus, samp:focus, 
+small:focus, span:focus, strike:focus, strong:focus, sub:focus, sup:focus, 
+table:focus, tbody:focus, td:focus, tfoot:focus, th:focus, thead:focus, 
+tr:focus, tt:focus, u:focus, ul:focus, var:focus {
+  /* Don't specify the outline-color, we should always use initial value. */
+   outline: 1px dotted;
+}
+
+/* hidden elements */
+area, base, basefont, head, meta, script, style, title,
+noembed, param, link {
+   display: none;
+}
+
+/* Page breaks at body tags, to help out with LIT-generation */
+body {
+  page-break-before: always;
+}
+
+/* Explicit line-breaks are blocks, sure... */
+br {
+  display: block;
+}
+
diff --git a/src/calibre/ebooks/lit/lzx.py b/src/calibre/ebooks/lit/lzx.py
new file mode 100644
index 0000000000..ee46e729c3
--- /dev/null
+++ b/src/calibre/ebooks/lit/lzx.py
@@ -0,0 +1,31 @@
+'''
+LZX compression/decompression wrapper.
+'''
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
+import sys
+from calibre import plugins
+
+_lzx, _error = plugins['lzx']
+if _lzx is None:
+    raise RuntimeError('Failed to load the lzx plugin: %s' % _error)
+
+__all__ = ['Compressor', 'Decompressor', 'LZXError']
+
+LZXError = _lzx.LZXError
+Compressor = _lzx.Compressor
+
+class Decompressor(object):
+    def __init__(self, wbits):
+        self.wbits = wbits
+        self.blocksize = 1 << wbits
+        _lzx.init(wbits)
+
+    def decompress(self, data, outlen):
+        return _lzx.decompress(data, outlen)
+
+    def reset(self):
+        return _lzx.reset()
diff --git a/src/calibre/ebooks/lit/mssha1.py b/src/calibre/ebooks/lit/mssha1.py
index 1708c8dd8b..29261e7313 100644
--- a/src/calibre/ebooks/lit/mssha1.py
+++ b/src/calibre/ebooks/lit/mssha1.py
@@ -4,6 +4,9 @@ Modified version of SHA-1 used in Microsoft LIT files.
 Adapted from the PyPy pure-Python SHA-1 implementation.
 """
 
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
 import struct, copy
 
 # ======================================================================
diff --git a/src/calibre/ebooks/lit/oeb.py b/src/calibre/ebooks/lit/oeb.py
new file mode 100644
index 0000000000..acc3275876
--- /dev/null
+++ b/src/calibre/ebooks/lit/oeb.py
@@ -0,0 +1,770 @@
+'''
+Basic support for manipulating OEB 1.x/2.0 content and metadata.
+'''
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
+import os
+import sys
+from collections import defaultdict
+from types import StringTypes
+from itertools import izip, count
+from urlparse import urldefrag, urlparse, urlunparse
+from urllib import unquote as urlunquote
+import logging
+from lxml import etree
+from calibre import LoggingInterface
+
+XML_PARSER = etree.XMLParser(recover=True, resolve_entities=False)
+XML_NS = 'http://www.w3.org/XML/1998/namespace'
+XHTML_NS = 'http://www.w3.org/1999/xhtml'
+OPF1_NS = 'http://openebook.org/namespaces/oeb-package/1.0/'
+OPF2_NS = 'http://www.idpf.org/2007/opf'
+DC09_NS = 'http://purl.org/metadata/dublin_core'
+DC10_NS = 'http://purl.org/dc/elements/1.0/'
+DC11_NS = 'http://purl.org/dc/elements/1.1/'
+XSI_NS = 'http://www.w3.org/2001/XMLSchema-instance'
+DCTERMS_NS = 'http://purl.org/dc/terms/'
+NCX_NS = 'http://www.daisy.org/z3986/2005/ncx/'
+XPNSMAP = {'h': XHTML_NS, 'o1': OPF1_NS, 'o2': OPF2_NS,
+           'd09': DC09_NS, 'd10': DC10_NS, 'd11': DC11_NS,
+           'xsi': XSI_NS, 'dt': DCTERMS_NS, 'ncx': NCX_NS}
+
+def XML(name): return '{%s}%s' % (XML_NS, name)
+def XHTML(name): return '{%s}%s' % (XHTML_NS, name)
+def OPF(name): return '{%s}%s' % (OPF2_NS, name)
+def DC(name): return '{%s}%s' % (DC11_NS, name)
+def NCX(name): return '{%s}%s' % (NCX_NS, name)
+
+XHTML_MIME = 'application/xhtml+xml'
+CSS_MIME = 'text/css'
+NCX_MIME = 'application/x-dtbncx+xml'
+OPF_MIME = 'application/oebps-package+xml'
+OEB_DOC_MIME = 'text/x-oeb1-document'
+OEB_CSS_MIME = 'text/x-oeb1-css'
+
+OEB_STYLES = set([CSS_MIME, OEB_CSS_MIME, 'text/x-oeb-css'])
+OEB_DOCS = set([XHTML_MIME, 'text/html', OEB_DOC_MIME, 'text/x-oeb-document'])
+
+
+def element(parent, *args, **kwargs):
+    if parent is not None:
+        return etree.SubElement(parent, *args, **kwargs)
+    return etree.Element(*args, **kwargs)
+
+def namespace(name):
+    if '}' in name:
+        return name.split('}', 1)[0][1:]
+    return ''
+
+def barename(name):
+    if '}' in name:
+        return name.split('}', 1)[1]
+    return name
+
+def xpath(elem, expr):
+    return elem.xpath(expr, namespaces=XPNSMAP)
+
+URL_UNSAFE = r"""`!@#$%^&*[](){}?+=;:'",<>\| """
+def urlquote(href):
+    result = []
+    for char in href:
+        if char in URL_UNSAFE:
+            char = "%%%02x" % ord(char)
+        result.append(char)
+    return ''.join(result)
+
+def urlnormalize(href):
+    parts = urlparse(href)
+    parts = (part.replace('\\', '/') for part in parts)
+    parts = (urlunquote(part) for part in parts)
+    parts = (urlquote(part) for part in parts)
+    return urlunparse(parts)
+
+
+class FauxLogger(object):
+    def __getattr__(self, name):
+        return self
+    def __call__(self, message):
+        print message
+
+
+class AbstractContainer(object):
+    def read_xml(self, path):
+        return etree.fromstring(
+            self.read(path), parser=XML_PARSER,
+            base_url=os.path.dirname(path))
+
+class DirContainer(AbstractContainer):
+    def __init__(self, rootdir):
+        self.rootdir = rootdir
+
+    def read(self, path):
+        path = os.path.join(self.rootdir, path)
+        with open(urlunquote(path), 'rb') as f:
+            return f.read()
+
+    def write(self, path, data):
+        path = os.path.join(self.rootdir, path)
+        with open(urlunquote(path), 'wb') as f:
+            return f.write(data)
+
+    def exists(self, path):
+        path = os.path.join(self.rootdir, path)
+        return os.path.isfile(path)
+
+
+class Metadata(object):
+    TERMS = set(['contributor', 'coverage', 'creator', 'date', 'description',
+                 'format', 'identifier', 'language', 'publisher', 'relation',
+                 'rights', 'source', 'subject', 'title', 'type'])
+    OPF1_NSMAP = {'dc': DC11_NS, 'oebpackage': OPF1_NS}
+    OPF2_NSMAP = {'opf': OPF2_NS, 'dc': DC11_NS, 'dcterms': DCTERMS_NS,
+                  'xsi': XSI_NS}
+    
+    class Item(object):
+        def __init__(self, term, value, fq_attrib={}):
+            self.fq_attrib = dict(fq_attrib)
+            if term == OPF('meta') and not value:
+                term = self.fq_attrib.pop('name')
+                value = self.fq_attrib.pop('content')
+            elif term in Metadata.TERMS and not namespace(term):
+                term = DC(term)
+            self.term = term
+            self.value = value
+            self.attrib = attrib = {}
+            for fq_attr in fq_attrib:
+                attr = barename(fq_attr)
+                attrib[attr] = fq_attrib[fq_attr]
+        
+        def __getattr__(self, name):
+            name = name.replace('_', '-')
+            try:
+                return self.attrib[name]
+            except KeyError:
+                raise AttributeError(
+                    '%r object has no attribute %r' \
+                        % (self.__class__.__name__, name))
+
+        def __repr__(self):
+            return 'Item(term=%r, value=%r, attrib=%r)' \
+                % (barename(self.term), self.value, self.attrib)
+
+        def __str__(self):
+            return str(self.value)
+
+        def __unicode__(self):
+            return unicode(self.value)
+
+        def to_opf1(self, dcmeta=None, xmeta=None):
+            if namespace(self.term) == DC11_NS:
+                name = DC(barename(self.term).title())
+                elem = element(dcmeta, name, attrib=self.attrib)
+                elem.text = self.value
+            else:
+                elem = element(xmeta, 'meta', attrib=self.attrib)
+                elem.attrib['name'] = self.term
+                elem.attrib['content'] = self.value
+            return elem
+        
+        def to_opf2(self, parent=None):
+            if namespace(self.term) == DC11_NS:
+                elem = element(parent, self.term, attrib=self.fq_attrib)
+                elem.text = self.value
+            else:
+                elem = element(parent, OPF('meta'), attrib=self.fq_attrib)
+                elem.attrib['name'] = self.term
+                elem.attrib['content'] = self.value
+            return elem
+    
+    def __init__(self, oeb):
+        self.oeb = oeb
+        self.items = defaultdict(list)
+
+    def add(self, term, value, attrib={}):
+        item = self.Item(term, value, attrib)
+        items = self.items[barename(item.term)]
+        items.append(item)
+        return item
+
+    def iterkeys(self):
+        for key in self.items:
+            yield key
+    __iter__ = iterkeys
+
+    def __getitem__(self, key):
+        return self.items[key]
+
+    def __contains__(self, key):
+        return key in self.items
+
+    def __getattr__(self, term):
+        return self.items[term]
+
+    def to_opf1(self, parent=None):
+        elem = element(parent, 'metadata')
+        dcmeta = element(elem, 'dc-metadata', nsmap=self.OPF1_NSMAP)
+        xmeta = element(elem, 'x-metadata')
+        for term in self.items:
+            for item in self.items[term]:
+                item.to_opf1(dcmeta, xmeta)
+        if 'ms-chaptertour' not in self.items:
+            chaptertour = self.Item('ms-chaptertour', 'chaptertour')
+            chaptertour.to_opf1(dcmeta, xmeta)
+        return elem
+        
+    def to_opf2(self, parent=None):
+        elem = element(parent, OPF('metadata'), nsmap=self.OPF2_NSMAP)
+        for term in self.items:
+            for item in self.items[term]:
+                item.to_opf2(elem)
+        return elem
+
+
+class Manifest(object):
+    class Item(object):
+        def __init__(self, id, href, media_type, fallback=None, loader=str):
+            self.id = id
+            self.href = self.path = urlnormalize(href)
+            self.media_type = media_type
+            self.fallback = fallback
+            self.spine_position = None
+            self.linear = True
+            self._loader = loader
+            self._data = None
+
+        def __repr__(self):
+            return 'Item(id=%r, href=%r, media_type=%r)' \
+                % (self.id, self.href, self.media_type)
+
+        def data():
+            def fget(self):
+                if self._data:
+                    return self._data
+                data = self._loader(self.href)
+                if self.media_type == XHTML_MIME:
+                    data = etree.fromstring(data, parser=XML_PARSER)
+                    if namespace(data.tag) != XHTML_NS:
+                        data.attrib['xmlns'] = XHTML_NS
+                        data = etree.tostring(data)
+                        data = etree.fromstring(data, parser=XML_PARSER)
+                elif self.media_type.startswith('application/') \
+                     and self.media_type.endswith('+xml'):
+                    data = etree.fromstring(data, parser=XML_PARSER)
+                return data
+            def fset(self, value):
+                self._data = value
+            def fdel(self):
+                self._data = None
+            return property(fget, fset, fdel)
+        data = data()
+
+        def __cmp__(self, other):
+            result = cmp(self.spine_position, other.spine_position)
+            if result != 0:
+                return result
+            return cmp(self.id, other.id)
+    
+    def __init__(self, oeb):
+        self.oeb = oeb
+        self.items = {}
+        self.hrefs = {}
+
+    def add(self, id, href, media_type, fallback=None):
+        item = self.Item(
+            id, href, media_type, fallback, self.oeb.container.read)
+        self.items[item.id] = item
+        self.hrefs[item.href] = item
+        return item
+
+    def remove(self, id):
+        href = self.items[id].href
+        del self.items[id]
+        del self.hrefs[href]
+
+    def __iter__(self):
+        for id in self.items:
+            yield id
+
+    def __getitem__(self, id):
+        return self.items[id]
+
+    def values(self):
+        for item in self.items.values():
+            yield item
+
+    def items(self):
+        for id, item in self.refs.items():
+            yield id, items
+    
+    def __contains__(self, key):
+        return key in self.items
+
+    def to_opf1(self, parent=None):
+        elem = element(parent, 'manifest')
+        for item in self.items.values():
+            media_type = item.media_type
+            if media_type == XHTML_MIME:
+                media_type = OEB_DOC_MIME
+            elif media_type == CSS_MIME:
+                media_type = OEB_CSS_MIME
+            attrib = {'id': item.id, 'href': item.href,
+                      'media-type': media_type}
+            if item.fallback:
+                attrib['fallback'] = item.fallback
+            element(elem, 'item', attrib=attrib)
+        return elem
+    
+    def to_opf2(self, parent=None):
+        elem = element(parent, OPF('manifest'))
+        for item in self.items.values():
+            attrib = {'id': item.id, 'href': item.href,
+                      'media-type': item.media_type}
+            if item.fallback:
+                attrib['fallback'] = item.fallback
+            element(elem, OPF('item'), attrib=attrib)
+        return elem
+
+
+class Spine(object):
+    def __init__(self, oeb):
+        self.oeb = oeb
+        self.items = []
+
+    def add(self, item, linear):
+        if isinstance(linear, StringTypes):
+            linear = linear.lower()
+        if linear is None or linear in ('yes', 'true'):
+            linear = True
+        elif linear in ('no', 'false'):
+            linear = False
+        item.linear = linear
+        item.spine_position = len(self.items)
+        self.items.append(item)
+        return item
+    
+    def __iter__(self):
+        for item in self.items:
+            yield item
+
+    def __getitem__(self, index):
+        return self.items[index]
+
+    def __len__(self):
+        return len(self.items)
+
+    def __contains__(self, item):
+        return (item in self.items)
+
+    def to_opf1(self, parent=None):
+        elem = element(parent, 'spine')
+        for item in self.items:
+            if item.linear:
+                element(elem, 'itemref', attrib={'idref': item.id})
+        return elem
+
+    def to_opf2(self, parent=None):
+        elem = element(parent, OPF('spine'))
+        for item in self.items:
+            attrib = {'idref': item.id}
+            if not item.linear:
+                attrib['linear'] = 'no'
+            element(elem, OPF('itemref'), attrib=attrib)
+        return elem
+
+
+class Guide(object):
+    class Reference(object):
+        def __init__(self, type, title, href):
+            self.type = type
+            self.title = title
+            self.href = urlnormalize(href)
+
+        def __repr__(self):
+            return 'Reference(type=%r, title=%r, href=%r)' \
+                % (self.type, self.title, self.href)
+    
+    def __init__(self, oeb):
+        self.oeb = oeb
+        self.refs = {}
+
+    def add(self, type, title, href):
+        ref = self.Reference(type, title, href)
+        self.refs[type] = ref
+        return ref
+
+    def by_type(self, type):
+        return self.ref_types[type]
+
+    def iterkeys(self):
+        for type in self.refs:
+            yield type
+    __iter__ = iterkeys
+
+    def values(self):
+        for ref in self.refs.values():
+            yield ref
+
+    def items(self):
+        for type, ref in self.refs.items():
+            yield type, ref
+    
+    def __getitem__(self, index):
+        return self.refs[index]
+
+    def __contains__(self, key):
+        return key in self.refs
+
+    def to_opf1(self, parent=None):
+        elem = element(parent, 'guide')
+        for ref in self.refs.values():
+            attrib = {'type': ref.type, 'href': ref.href}
+            if ref.title:
+                attrib['title'] = ref.title
+            element(elem, 'reference', attrib=attrib)
+        return elem
+    
+    def to_opf2(self, parent=None):
+        elem = element(parent, OPF('guide'))
+        for ref in self.refs.values():
+            attrib = {'type': ref.type, 'href': ref.href}
+            if ref.title:
+                attrib['title'] = ref.title
+            element(elem, OPF('reference'), attrib=attrib)
+        return elem
+
+
+class TOC(object):
+    def __init__(self, title=None, href=None, klass=None, id=None):
+        self.title = title
+        self.href = urlnormalize(href) if href else href
+        self.klass = klass
+        self.id = id
+        self.nodes = []
+    
+    def add(self, title, href, klass=None, id=None):
+        node = TOC(title, href, klass, id)
+        self.nodes.append(node)
+        return node
+    
+    def __iter__(self):
+        for node in self.nodes:
+            yield node
+    
+    def __getitem__(self, index):
+        return self.nodes[index]
+    
+    def depth(self, level=0):
+        if self.nodes:
+            return self.nodes[0].depth(level+1)
+        return level
+
+    def to_opf1(self, tour):
+        for node in self.nodes:
+            element(tour, 'site', attrib={
+                'title': node.title, 'href': node.href})
+            node.to_opf1(tour)
+        return tour
+    
+    def to_ncx(self, parent, playorder=None, depth=1):
+        if not playorder: playorder = [0]
+        for node in self.nodes:
+            playorder[0] += 1
+            point = etree.SubElement(parent,
+                NCX('navPoint'), attrib={'playOrder': str(playorder[0])})
+            if self.klass:
+                point.attrib['class'] = node.klass
+            if self.id:
+                point.attrib['id'] = node.id
+            label = etree.SubElement(point, NCX('navLabel'))
+            etree.SubElement(label, NCX('text')).text = node.title
+            href = node.href if depth > 1 else urldefrag(node.href)[0]
+            child = etree.SubElement(point,
+                NCX('content'), attrib={'src': href})
+            node.to_ncx(point, playorder, depth+1)
+        return parent
+
+    
+class OEBBook(object):
+    def __init__(self, opfpath, container=None, logger=FauxLogger()):
+        if not container:
+            container = DirContainer(os.path.dirname(opfpath))
+            opfpath = os.path.basename(opfpath)
+        self.container = container
+        self.logger = logger
+        opf = self._read_opf(opfpath)
+        self._all_from_opf(opf)
+    
+    def _convert_opf1(self, opf):
+        nroot = etree.Element(OPF('package'),
+            nsmap={None: OPF2_NS}, version="2.0", **dict(opf.attrib))
+        metadata = etree.SubElement(nroot, OPF('metadata'),
+            nsmap={'opf': OPF2_NS, 'dc': DC11_NS,
+                   'xsi': XSI_NS, 'dcterms': DCTERMS_NS})
+        for prefix in ('d11', 'd10', 'd09'):
+            elements = xpath(opf, 'metadata/dc-metadata/%s:*' % prefix)
+            if elements: break
+        for element in elements:
+            if not element.text: continue
+            tag = barename(element.tag).lower()
+            element.tag = '{%s}%s' % (DC11_NS, tag)
+            for name in element.attrib:
+                if name in ('role', 'file-as', 'scheme'):
+                    nsname = '{%s}%s' % (OPF2_NS, name)
+                    element.attrib[nsname] = element.attrib[name]
+                    del element.attrib[name]
+            metadata.append(element)
+        for element in opf.xpath('metadata/x-metadata/meta'):
+            metadata.append(element)
+        for item in opf.xpath('manifest/item'):
+            media_type = item.attrib['media-type'].lower()
+            if media_type in OEB_DOCS:
+                media_type = XHTML_MIME
+            elif media_type in OEB_STYLES:
+                media_type = CSS_MIME
+            item.attrib['media-type'] = media_type
+        for tag in ('manifest', 'spine', 'tours', 'guide'):
+            for element in opf.xpath(tag):
+                nroot.append(element)
+        return etree.fromstring(etree.tostring(nroot), parser=XML_PARSER)
+    
+    def _read_opf(self, opfpath):
+        opf = self.container.read_xml(opfpath)
+        version = float(opf.get('version', 1.0))
+        if version < 2.0:
+            opf = self._convert_opf1(opf)
+        return opf
+    
+    def _metadata_from_opf(self, opf):
+        uid = opf.attrib['unique-identifier']
+        self.metadata = metadata = Metadata(self)        
+        for elem in xpath(opf, '/o2:package/o2:metadata/*'):
+            if elem.text or elem.attrib:
+                metadata.add(elem.tag, elem.text, elem.attrib)
+        for item in metadata.identifier:
+            if item.id == uid:
+                self.uid = item
+                break
+        else:
+            self.logger.log_warn(u'Unique-identifier %r not found.' % uid)
+            self.uid = metadata.identifier[0]
+    
+    def _manifest_from_opf(self, opf):
+        self.manifest = manifest = Manifest(self)
+        for elem in xpath(opf, '/o2:package/o2:manifest/o2:item'):
+            href = elem.get('href')
+            if not self.container.exists(href):
+                self.logger.log_warn(u'Manifest item %r not found.' % href)
+                continue
+            manifest.add(elem.get('id'), href, elem.get('media-type'),
+                         elem.get('fallback'))
+    
+    def _spine_from_opf(self, opf):
+        self.spine = spine = Spine(self)
+        for elem in xpath(opf, '/o2:package/o2:spine/o2:itemref'):
+            idref = elem.get('idref')
+            if idref not in self.manifest:
+                self.logger.log_warn(u'Spine item %r not found.' % idref)
+                continue
+            item = self.manifest[idref]
+            spine.add(item, elem.get('linear'))
+        extras = []
+        for item in self.manifest.values():
+            if item.media_type == XHTML_MIME \
+               and item not in spine:
+                extras.append(item)
+        extras.sort()
+        for item in extras:
+            spine.add(item, False)
+
+    def _guide_from_opf(self, opf):
+        self.guide = guide = Guide(self)
+        for elem in xpath(opf, '/o2:package/o2:guide/o2:reference'):
+            href = elem.get('href')
+            path, frag = urldefrag(href)
+            if path not in self.manifest.hrefs:
+                self.logger.log_warn(u'Guide reference %r not found' % href)
+                continue
+            guide.add(elem.get('type'), elem.get('title'), href)
+
+    def _toc_from_navpoint(self, toc, navpoint):
+        children = xpath(navpoint, 'ncx:navPoint')
+        for child in children:
+            title = ''.join(xpath(child, 'ncx:navLabel/ncx:text/text()'))
+            href = xpath(child, 'ncx:content/@src')[0]
+            id = child.get('id')
+            klass = child.get('class')
+            node = toc.add(title, href, id=id, klass=klass)
+            self._toc_from_navpoint(node, child)
+            
+    def _toc_from_ncx(self, opf):
+        result = xpath(opf, '/o2:package/o2:spine/@toc')
+        if not result:
+            expr = '/o2:package/o2:manifest/o2:item[@media-type="%s"]/@id'
+            result = xpath(opf, expr % NCX_MIME)
+            if len(result) != 1:
+                return False
+        id = result[0]
+        ncx = self.manifest[id].data
+        self.manifest.remove(id)
+        title = xpath(ncx, 'ncx:docTitle/ncx:text/text()')[0]
+        self.toc = toc = TOC(title)
+        navmaps = xpath(ncx, 'ncx:navMap')
+        for navmap in navmaps:
+            self._toc_from_navpoint(toc, navmap)
+        return True
+
+    def _toc_from_tour(self, opf):
+        result = xpath(opf, '/o2:package/o2:tours/o2:tour')
+        if not result:
+            return False
+        tour = result[0]
+        self.toc = toc = TOC(tour.get('title'))
+        sites = xpath(tour, 'o2:site')
+        for site in sites:
+            toc.add(site.get('title'), site.get('href'))
+        return True
+
+    def _toc_from_html(self, opf):
+        if 'toc' not in self.guide:
+            return False
+        self.toc = toc = TOC()
+        itempath, frag = urldefrag(self.guide['toc'].href)
+        item = self.manifest.hrefs[itempath]
+        html = item.data
+        if frag:
+            elems = xpath(html, './/*[@id="%s"]' % frag)
+            if not elems:
+                elems = xpath(html, './/*[@name="%s"]' % frag)
+            elem = elems[0] if elems else html
+            while elem != html and not xpath(elem, './/h:a[@href]'):
+                elem = elem.getparent()
+            html = elem
+        titles = defaultdict(list)
+        order = []
+        for anchor in xpath(html, './/h:a[@href]'):
+            href = anchor.attrib['href']
+            path, frag = urldefrag(href)
+            if not path:
+                href = '#'.join((itempath, frag))
+            title = ' '.join(xpath(anchor, './/text()'))
+            href = urlnormalize(href)
+            if href not in titles:
+                order.append(href)
+            titles[href].append(title)
+        for href in order:
+            toc.add(' '.join(titles[href]), href)
+        return True
+    
+    def _toc_from_spine(self, opf):
+        self.toc = toc = TOC()
+        titles = []
+        headers = []
+        for item in self.spine:
+            if not item.linear: continue
+            html = item.data
+            title = xpath(html, '/h:html/h:head/h:title/text()')
+            if title: titles.append(title[0])
+            headers.append('(unlabled)')
+            for tag in ('h1', 'h2', 'h3', 'h4', 'h5', 'strong'):
+                expr = '/h:html/h:body//h:%s[position()=1]/text()' % (tag,)
+                header = xpath(html, expr)
+                if header:
+                    headers[-1] = header[0]
+                    break
+        use = titles
+        if len(titles) > len(set(titles)):
+            use = headers
+        for title, item in izip(use, self.spine):
+            if not item.linear: continue
+            toc.add(title, item.href)
+        return True
+    
+    def _toc_from_opf(self, opf):
+        if self._toc_from_ncx(opf): return
+        if self._toc_from_tour(opf): return
+        if self._toc_from_html(opf): return
+        self._toc_from_spine(opf)
+            
+    def _all_from_opf(self, opf):
+        self._metadata_from_opf(opf)
+        self._manifest_from_opf(opf)
+        self._spine_from_opf(opf)
+        self._guide_from_opf(opf)
+        self._toc_from_opf(opf)
+
+    def to_opf1(self):
+        package = etree.Element('package',
+            attrib={'unique-identifier': self.uid.id})
+        metadata = self.metadata.to_opf1(package)
+        manifest = self.manifest.to_opf1(package)
+        spine = self.spine.to_opf1(package)
+        tours = element(package, 'tours')
+        tour = element(tours, 'tour',
+            attrib={'id': 'chaptertour', 'title': 'Chapter Tour'})
+        self.toc.to_opf1(tour)
+        guide = self.guide.to_opf1(package)
+        return {OPF_MIME: ('content.opf', package)}
+
+    def _generate_ncx_item(self):
+        id = 'ncx'
+        index = 0
+        while id in self.manifest:
+            id = 'ncx' + str(index)
+            index = index + 1
+        href = 'toc'
+        index = 0
+        while (href + '.ncx') in self.manifest.hrefs:
+            href = 'toc' + str(index)
+        href += '.ncx'
+        return (id, href)
+        
+    def _to_ncx(self):
+        ncx = etree.Element(NCX('ncx'), attrib={'version': '2005-1'},
+                            nsmap={None: NCX_NS})
+        head = etree.SubElement(ncx, NCX('head'))
+        etree.SubElement(head, NCX('meta'),
+            attrib={'name': 'dtb:uid', 'content': unicode(self.uid)})
+        etree.SubElement(head, NCX('meta'),
+            attrib={'name': 'dtb:depth', 'content': str(self.toc.depth())})
+        etree.SubElement(head, NCX('meta'),
+            attrib={'name': 'dtb:totalPageCount', 'content': '0'})
+        etree.SubElement(head, NCX('meta'),
+            attrib={'name': 'dtb:maxPageNumber', 'content': '0'})
+        title = etree.SubElement(ncx, NCX('docTitle'))
+        text = etree.SubElement(title, NCX('text'))
+        text.text = unicode(self.metadata.title[0])
+        navmap = etree.SubElement(ncx, NCX('navMap'))
+        self.toc.to_ncx(navmap)
+        return ncx
+    
+    def to_opf2(self):
+        package = etree.Element(OPF('package'),
+            attrib={'version': '2.0', 'unique-identifier': self.uid.id},
+            nsmap={None: OPF2_NS})
+        metadata = self.metadata.to_opf2(package)
+        manifest = self.manifest.to_opf2(package)
+        id, href = self._generate_ncx_item()
+        etree.SubElement(manifest, OPF('item'),
+            attrib={'id': id, 'href': href, 'media-type': NCX_MIME})
+        spine = self.spine.to_opf2(package)
+        spine.attrib['toc'] = id
+        guide = self.guide.to_opf2(package)
+        ncx = self._to_ncx()
+        return {OPF_MIME: ('content.opf', package),
+                NCX_MIME: (href, ncx)}
+
+
+def main(argv=sys.argv):
+    for arg in argv[1:]:
+        oeb = OEBBook(arg)
+        for name, doc in oeb.to_opf1().values():
+            print etree.tostring(doc, pretty_print=True)
+        for name, doc in oeb.to_opf2().values():
+            print etree.tostring(doc, pretty_print=True)
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py
index 671e48ab76..90df14e2c0 100644
--- a/src/calibre/ebooks/lit/reader.py
+++ b/src/calibre/ebooks/lit/reader.py
@@ -10,10 +10,12 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net> ' \
 import sys, struct, cStringIO, os
 import functools
 import re
+from urlparse import urldefrag
 from lxml import etree
 from calibre.ebooks.lit import LitError
 from calibre.ebooks.lit.maps import OPF_MAP, HTML_MAP
 import calibre.ebooks.lit.mssha1 as mssha1
+from calibre.ebooks.lit.oeb import urlnormalize
 from calibre.ebooks import DRMError
 from calibre import plugins
 lzx, lxzerror = plugins['lzx']
@@ -110,7 +112,7 @@ class UnBinary(object):
     AMPERSAND_RE = re.compile(
         r'&(?!(?:#[0-9]+|#x[0-9a-fA-F]+|[a-zA-Z_:][a-zA-Z0-9.-_:]+);)')
     OPEN_ANGLE_RE = re.compile(r'<<(?![!]--)')
-    CLOSE_ANGLE_RE = re.compile(r'(?<!--)>>')
+    CLOSE_ANGLE_RE = re.compile(r'(?<!--)>>(?=>>|[^>])')
     DOUBLE_ANGLE_RE = re.compile(r'([<>])\1')
     
     def __init__(self, bin, path, manifest={}, map=HTML_MAP):
@@ -322,12 +324,12 @@ class UnBinary(object):
                 href += c
                 count -= 1
                 if count == 0:
-                    doc, m, frag = href[1:].partition('#')
+                    doc, frag = urldefrag(href[1:])
                     path = self.item_path(doc)
-                    if m and frag:
-                        path += m + frag
-                    self.buf.write((u'"%s"' % path).encode(
-                        'ascii', 'xmlcharrefreplace'))
+                    if frag:
+                        path = '#'.join((path, frag))
+                    path = urlnormalize(path)
+                    self.buf.write((u'"%s"' % path).encode('utf-8'))
                     state = 'get attr'
         return index
     
@@ -385,7 +387,7 @@ def preserve(function):
 class LitReader(object):
     PIECE_SIZE = 16
     XML_PARSER = etree.XMLParser(
-        remove_blank_text=True, resolve_entities=False)
+        recover=True, resolve_entities=False)
 
     def magic():
         @preserve
@@ -781,7 +783,7 @@ class LitReader(object):
                     try:
                         result.append(
                             lzx.decompress(content[base:size], window_bytes))
-                    except lzx.LzxError:
+                    except lzx.LZXError:
                         self._warn("LZX decompression error; skipping chunk")
                     bytes_remaining -= window_bytes
                     base = size
@@ -791,7 +793,7 @@ class LitReader(object):
             lzx.reset()
             try:
                 result.append(lzx.decompress(content[base:], bytes_remaining))
-            except lzx.LzxError:
+            except lzx.LZXError:
                 self._warn("LZX decompression error; skipping chunk")
             bytes_remaining = 0
         if bytes_remaining > 0:
diff --git a/src/calibre/ebooks/lit/stylizer.py b/src/calibre/ebooks/lit/stylizer.py
new file mode 100644
index 0000000000..7a89474d89
--- /dev/null
+++ b/src/calibre/ebooks/lit/stylizer.py
@@ -0,0 +1,444 @@
+# -*- encoding: utf-8 -*-
+
+'''
+CSS property propagation class.
+'''
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
+import sys
+import os
+import locale
+import codecs
+import itertools
+import types
+import re
+import copy
+import cssutils
+from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
+    CSSValueList, cssproperties
+from lxml import etree
+from calibre.ebooks.lit.oeb import XHTML_NS, CSS_MIME, OEB_STYLES
+from calibre.ebooks.lit.oeb import barename, urlnormalize
+from calibre.resources import html_css
+
+HTML_CSS_STYLESHEET = cssutils.parseString(html_css)
+XHTML_CSS_NAMESPACE = "@namespace url(http://www.w3.org/1999/xhtml);\n"
+
+INHERITED = set(['azimuth', 'border-collapse', 'border-spacing',
+                 'caption-side', 'color', 'cursor', 'direction', 'elevation',
+                 'empty-cells', 'font-family', 'font-size', 'font-style',
+                 'font-variant', 'font-weight', 'letter-spacing',
+                 'line-height', 'list-style-image', 'list-style-position',
+                 'list-style-type', 'orphans', 'page-break-inside',
+                 'pitch-range', 'pitch', 'quotes', 'richness', 'speak-header',
+                 'speak-numeral', 'speak-punctuation', 'speak', 'speech-rate',
+                 'stress', 'text-align', 'text-indent', 'text-transform',
+                 'visibility', 'voice-family', 'volume', 'white-space',
+                 'widows', 'word-spacing'])
+
+DEFAULTS = {'azimuth': 'center', 'background-attachment': 'scroll',
+            'background-color': 'transparent', 'background-image': 'none',
+            'background-position': '0% 0%', 'background-repeat': 'repeat',
+            'border-bottom-color': ':color', 'border-bottom-style': 'none',
+            'border-bottom-width': 'medium', 'border-collapse': 'separate',
+            'border-left-color': ':color', 'border-left-style': 'none',
+            'border-left-width': 'medium', 'border-right-color': ':color',
+            'border-right-style': 'none', 'border-right-width': 'medium',
+            'border-spacing': 0, 'border-top-color': ':color',
+            'border-top-style': 'none', 'border-top-width': 'medium', 'bottom':
+            'auto', 'caption-side': 'top', 'clear': 'none', 'clip': 'auto',
+            'color': 'black', 'content': 'normal', 'counter-increment': 'none',
+            'counter-reset': 'none', 'cue-after': 'none', 'cue-before': 'none',
+            'cursor': 'auto', 'direction': 'ltr', 'display': 'inline',
+            'elevation': 'level', 'empty-cells': 'show', 'float': 'none',
+            'font-family': 'serif', 'font-size': 'medium', 'font-style':
+            'normal', 'font-variant': 'normal', 'font-weight': 'normal',
+            'height': 'auto', 'left': 'auto', 'letter-spacing': 'normal',
+            'line-height': 'normal', 'list-style-image': 'none',
+            'list-style-position': 'outside', 'list-style-type': 'disc',
+            'margin-bottom': 0, 'margin-left': 0, 'margin-right': 0,
+            'margin-top': 0, 'max-height': 'none', 'max-width': 'none',
+            'min-height': 0, 'min-width': 0, 'orphans': '2',
+            'outline-color': 'invert', 'outline-style': 'none',
+            'outline-width': 'medium', 'overflow': 'visible', 'padding-bottom':
+            0, 'padding-left': 0, 'padding-right': 0, 'padding-top': 0,
+            'page-break-after': 'auto', 'page-break-before': 'auto',
+            'page-break-inside': 'auto', 'pause-after': 0, 'pause-before':
+            0, 'pitch': 'medium', 'pitch-range': '50', 'play-during': 'auto',
+            'position': 'static', 'quotes': u"'ā€œ' 'ā€' 'ā€˜' 'ā€™'", 'richness':
+            '50', 'right': 'auto', 'speak': 'normal', 'speak-header': 'once',
+            'speak-numeral': 'continuous', 'speak-punctuation': 'none',
+            'speech-rate': 'medium', 'stress': '50', 'table-layout': 'auto',
+            'text-align': 'left', 'text-decoration': 'none', 'text-indent':
+            0, 'text-transform': 'none', 'top': 'auto', 'unicode-bidi':
+            'normal', 'vertical-align': 'baseline', 'visibility': 'visible',
+            'voice-family': 'default', 'volume': 'medium', 'white-space':
+            'normal', 'widows': '2', 'width': 'auto', 'word-spacing': 'normal',
+            'z-index': 'auto'}
+
+FONT_SIZE_NAMES = set(['xx-small', 'x-small', 'small', 'medium', 'large',
+                       'x-large', 'xx-large'])
+
+FONT_SIZE_LIST = [('xx-small', 1,     6.),
+                  ('x-small',  None,  7.),
+                  ('small',    2,     8.),
+                  ('medium',   3,     9.),
+                  ('large',    4,    11.),
+                  ('x-large',  5,    13.),
+                  ('xx-large', 6,    15.),
+                  (None,       7,    17.)]
+
+FONT_SIZE_BY_NAME = {}
+FONT_SIZE_BY_NUM = {}
+for name, num, size in FONT_SIZE_LIST:
+    FONT_SIZE_BY_NAME[name] = size
+    FONT_SIZE_BY_NUM[num] = size
+
+XPNSMAP = {'h': XHTML_NS,}
+def xpath(elem, expr):
+    return elem.xpath(expr, namespaces=XPNSMAP)
+
+
+class Page(object):
+    def __init__(self, width, height, dpi):
+        self.width = float(width)
+        self.height = float(height)
+        self.dpi = float(dpi)
+
+class Profiles(object):
+    PRS500 = Page(584, 754, 168.451)
+    PRS505 = PRS500
+
+    
+class Stylizer(object):    
+    STYLESHEETS = {}
+    
+    def __init__(self, tree, path, oeb, page=Profiles.PRS505):
+        self.page = page
+        base = os.path.dirname(path)
+        basename = os.path.basename(path)
+        cssname = os.path.splitext(basename)[0] + '.css'
+        stylesheets = [HTML_CSS_STYLESHEET]
+        head = xpath(tree, '/h:html/h:head')[0]
+        parser = cssutils.CSSParser()
+        parser.setFetcher(lambda path: ('utf-8', oeb.container.read(path)))
+        for elem in head:
+            tag = barename(elem.tag)
+            if tag == 'style':
+                text = ''.join(elem.text)
+                stylesheet = parser.parseString(text, href=cssname)
+                stylesheets.append(stylesheet)
+            elif tag == 'link' \
+                 and elem.get('rel', 'stylesheet') == 'stylesheet' \
+                 and elem.get('type', CSS_MIME) in OEB_STYLES:
+                href = urlnormalize(elem.attrib['href'])
+                path = os.path.join(base, href)
+                path = os.path.normpath(path).replace('\\', '/')
+                if path in self.STYLESHEETS:
+                    stylesheet = self.STYLESHEETS[path]
+                else:
+                    data = XHTML_CSS_NAMESPACE
+                    data += oeb.manifest.hrefs[path].data
+                    stylesheet = parser.parseString(data, href=path)
+                    self.STYLESHEETS[path] = stylesheet
+                stylesheets.append(stylesheet)
+        rules = []
+        index = 0
+        self.stylesheets = set()
+        for stylesheet in stylesheets:
+            href = stylesheet.href
+            self.stylesheets.add(href)
+            for rule in stylesheet.cssRules:
+                rules.extend(self.flatten_rule(rule, href, index))
+                index = index + 1
+        rules.sort()
+        self.rules = rules
+        self._styles = {}
+
+    def flatten_rule(self, rule, href, index):
+        results = []
+        if isinstance(rule, CSSStyleRule):
+            style = self.flatten_style(rule.style)
+            for selector in rule.selectorList:
+                specificity = selector.specificity + (index,)
+                text = selector.selectorText
+                selector = list(selector.seq)
+                results.append((specificity, selector, style, text, href))
+        elif isinstance(rule, CSSPageRule):
+            style = self.flatten_style(rule.style)
+            results.append(((0, 0, 0, 0), [], style, '@page', href))
+        return results
+
+    def flatten_style(self, cssstyle):
+        style = {}
+        for prop in cssstyle:
+            name = prop.name
+            if name in ('margin', 'padding'):
+                style.update(self._normalize_edge(prop.cssValue, name))
+            elif name == 'font':
+                style.update(self._normalize_font(prop.cssValue))
+            else:
+                style[name] = prop.value
+        if 'font-size' in style:
+            size = style['font-size']
+            if size == 'normal': size = 'medium'
+            if size in FONT_SIZE_NAMES:
+                style['font-size'] = "%dpt" % FONT_SIZE_BY_NAME[size]
+        return style
+    
+    def _normalize_edge(self, cssvalue, name):
+        style = {}
+        if isinstance(cssvalue, CSSValueList):
+            primitives = [v.cssText for v in cssvalue]
+        else:
+            primitives = [cssvalue.cssText]
+        if len(primitives) == 1:
+            value, = primitives
+            values = [value, value, value, value]
+        elif len(primitives) == 2:
+            vert, horiz = primitives
+            values = [vert, horiz, vert, horiz]
+        elif len(primitives) == 3:
+            top, horiz, bottom = primitives
+            values = [top, horiz, bottom, horiz]
+        else:
+            values = primitives[:4]
+        edges = ('top', 'right', 'bottom', 'left')
+        for edge, value in itertools.izip(edges, values):
+            style["%s-%s" % (name, edge)] = value
+        return style
+        
+    def _normalize_font(self, cssvalue):
+        composition = ('font-style', 'font-variant', 'font-weight',
+                       'font-size', 'line-height', 'font-family')
+        style = {}
+        if cssvalue.cssText == 'inherit':
+            for key in composition:
+                style[key] = 'inherit'
+        else:
+            primitives = [v.cssText for v in cssvalue]
+            primitites.reverse()
+            value = primitives.pop()
+            for key in composition:
+                if cssproperties.cssvalues[key](value):
+                    style[key] = value
+                    if not primitives: break
+                    value = primitives.pop()
+            for key in composition:
+                if key not in style:
+                    style[key] = DEFAULTS[key]
+        return style
+
+    def style(self, element):
+        try: return self._styles[element]
+        except: pass
+        return Style(element, self)
+
+    def stylesheet(self, name, font_scale=None):
+        rules = []
+        for _, _, style, selector, href in self.rules:
+            if href != name: continue
+            if font_scale and 'font-size' in style and \
+                    style['font-size'].endswith('pt'):
+                style = copy.copy(style)
+                size = float(style['font-size'][:-2])
+                style['font-size'] = "%.2fpt" % (size * font_scale)
+            style = ';\n    '.join(': '.join(item) for item in style.items())
+            rules.append('%s {\n    %s;\n}' % (selector, style))
+        return '\n'.join(rules)
+
+class Style(object):
+    def __init__(self, element, stylizer):
+        self._element = element
+        self._page = stylizer.page
+        self._stylizer = stylizer
+        self._style = self._assemble_style(element, stylizer)
+        stylizer._styles[element] = self
+        
+    def _assemble_style(self, element, stylizer):
+        result = {}
+        rules = stylizer.rules
+        for _, selector, style, _, _ in rules:
+            if self._selects_element(element, selector):
+                result.update(style)
+        try:
+            style = CSSStyleDeclaration(element.attrib['style'])
+            result.update(stylizer.flatten_style(style))
+        except KeyError:
+            pass
+        return result
+        
+    def _selects_element(self, element, selector):
+        def _selects_element(element, items, index):
+            if index == -1:
+                return True
+            item = items[index]
+            if item.type == 'universal':
+                pass
+            elif item.type == 'type-selector':
+                name1 = ("{%s}%s" % item.value).lower()
+                name2 = element.tag.lower()
+                if name1 != name2:
+                    return False
+            elif item.type == 'id':
+                name1 = item.value[1:]
+                name2 = element.get('id', '')
+                if name1 != name2:
+                    return False
+            elif item.type == 'class':
+                name = item.value[1:].lower()
+                classes = element.get('class', '').lower().split()
+                if name not in classes:
+                    return False
+            elif item.type == 'child':
+                parent = element.getparent()
+                if parent is None:
+                    return False
+                element = parent
+            elif item.type == 'descendant':
+                element = element.getparent()
+                while element is not None:
+                    if _selects_element(element, items, index - 1):
+                        return True
+                    element = element.getparent()
+                return False
+            elif item.type == 'pseudo-class':
+                if item.value == ':first-child':
+                    e = element.getprevious()
+                    if e is not None:
+                        return False
+                else:
+                    return False
+            elif item.type == 'pseudo-element':
+                return False
+            else:
+                return False
+            return _selects_element(element, items, index - 1)
+        return _selects_element(element, selector, len(selector) - 1)
+
+    def _has_parent(self):
+        parent = self._element.getparent()
+        return (parent is not None) \
+            and (parent in self._stylizer._styles)
+    
+    def __getitem__(self, name):
+        domname = cssproperties._toDOMname(name)
+        if hasattr(self, domname):
+            return getattr(self, domname)
+        return self._unit_convert(self._get(name))
+    
+    def _get(self, name):
+        result = None
+        if name in self._style:
+            result = self._style[name]
+        if (result == 'inherit'
+            or (result is None and name in INHERITED
+                and self._has_parent())):
+            styles = self._stylizer._styles
+            result = styles[self._element.getparent()]._get(name)
+        if result is None:
+            result = DEFAULTS[name]
+        return result
+
+    def _unit_convert(self, value, base=None, font=None):
+        if isinstance(value, (int, long, float)):
+            return value
+        try:
+            if float(value) == 0:
+                return 0.0
+        except:
+            pass
+        result = value
+        m = re.search(
+            r"^(-*[0-9]*\.?[0-9]*)\s*(%|em|px|mm|cm|in|pt|pc)$", value)
+        if m is not None and m.group(1):
+            value = float(m.group(1))
+            unit = m.group(2)
+            if unit == '%':
+                base = base or self.width
+                result = (value/100.0) * base
+            elif unit == 'px':
+                result = value * 72.0 / self._page.dpi
+            elif unit == 'in':
+                result = value * 72.0
+            elif unit == 'pt':
+                result = value 
+            elif unit == 'em':
+                font = font or self.fontSize
+                result = value * font
+            elif unit == 'pc':
+                result = value * 12.0
+            elif unit == 'mm':
+                result = value * 0.04
+            elif unit == 'cm':
+                result = value * 0.40
+        return result
+
+    @property
+    def fontSize(self):
+        def normalize_fontsize(value, base=None):
+            result = None
+            factor = None
+            if value == 'inherit':
+                value = 'medium'
+            if value in FONT_SIZE_NAMES:
+                result = FONT_SIZE_BY_NAME[value]
+            elif value == 'smaller':
+                factor = 1.0/1.2
+                for _, _, size in FONT_SIZE_LIST:
+                    if base <= size: break
+                    factor = None
+                    result = size
+            elif value == 'larger':
+                factor = 1.2
+                for _, _, size in reversed(FONT_SIZE_LIST):
+                    if base >= size: break
+                    factor = None
+                    result = size
+            else:
+                result = self._unit_convert(value, base=base, font=base)
+                if result < 0:
+                    result = normalize_fontsize("smaller", base)
+            if factor:
+                result = factor * base
+            return result
+        result = None
+        if self._has_parent():
+            styles = self._stylizer._styles
+            base = styles[self._element.getparent()].fontSize
+        else:
+            base = normalize_fontsize(DEFAULTS['font-size'])
+        if 'font-size' in self._style:
+            size = self._style['font-size']
+            result = normalize_fontsize(size, base)
+        else:
+            result = base
+        self.__dict__['fontSize'] = result
+        return result
+
+    @property
+    def width(self):
+        result = None
+        base = None
+        if self._has_parent():
+            styles = self._stylizer._styles
+            base = styles[self._element.getparent()].width
+        else:
+            base = self._page.width
+        if 'width' in self._style:
+            width = self._style['width']
+            if width == 'auto':
+                result = base
+            else:
+                result = self._unit_convert(width, base=base)
+        else:
+            result = base
+        self.__dict__['width'] = result
+        return result
+    
+    def __str__(self):
+        items = self._style.items()
+        return '; '.join("%s: %s" % (key, val) for key, val in items)
diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py
new file mode 100644
index 0000000000..02981dac37
--- /dev/null
+++ b/src/calibre/ebooks/lit/writer.py
@@ -0,0 +1,753 @@
+'''
+Basic support for writing LIT files.
+'''
+from __future__ import with_statement
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+
+import sys
+import os
+from cStringIO import StringIO
+from struct import pack
+from itertools import izip, count, chain
+import time
+import random
+import re
+import copy
+import uuid
+import functools
+import logging
+from urlparse import urldefrag
+from urllib import unquote as urlunquote
+from lxml import etree
+from calibre.ebooks.lit.reader import DirectoryEntry
+import calibre.ebooks.lit.maps as maps
+from calibre.ebooks.lit.oeb import OEB_DOCS, OEB_STYLES, OEB_CSS_MIME, \
+    CSS_MIME, OPF_MIME, XML_NS, XML
+from calibre.ebooks.lit.oeb import namespace, barename, urlnormalize, xpath
+from calibre.ebooks.lit.oeb import FauxLogger, OEBBook
+from calibre.ebooks.lit.stylizer import Stylizer
+from calibre.ebooks.lit.lzx import Compressor
+import calibre
+from calibre import LoggingInterface
+from calibre import plugins
+msdes, msdeserror = plugins['msdes']
+import calibre.ebooks.lit.mssha1 as mssha1
+from calibre.customize.ui import run_plugins_on_postprocess
+
+__all__ = ['LitWriter']
+
+LIT_IMAGES = set(['image/png', 'image/jpeg', 'image/gif'])
+LIT_MIMES = OEB_DOCS | OEB_STYLES | LIT_IMAGES
+
+MS_COVER_TYPE = 'other.ms-coverimage-standard'
+ALL_MS_COVER_TYPES = [
+    (MS_COVER_TYPE, 'Standard cover image'),
+    ('other.ms-thumbimage-standard', 'Standard thumbnail image'),
+    ('other.ms-coverimage', 'PocketPC cover image'),
+    ('other.ms-thumbimage', 'PocketPC thumbnail image'),
+    ]
+
+def invert_tag_map(tag_map):
+    tags, dattrs, tattrs = tag_map
+    tags = dict((tags[i], i) for i in xrange(len(tags)))
+    dattrs = dict((v, k) for k, v in dattrs.items())
+    tattrs = [dict((v, k) for k, v in (map or {}).items()) for map in tattrs]
+    for map in tattrs:
+        if map: map.update(dattrs)
+    tattrs[0] = dattrs
+    return tags, tattrs
+
+OPF_MAP = invert_tag_map(maps.OPF_MAP)
+HTML_MAP = invert_tag_map(maps.HTML_MAP)
+
+LIT_MAGIC = 'ITOLITLS'
+
+LITFILE_GUID = "{0A9007C1-4076-11D3-8789-0000F8105754}"
+PIECE3_GUID = "{0A9007C3-4076-11D3-8789-0000F8105754}"
+PIECE4_GUID = "{0A9007C4-4076-11D3-8789-0000F8105754}"
+DESENCRYPT_GUID = "{67F6E4A2-60BF-11D3-8540-00C04F58C3CF}"
+LZXCOMPRESS_GUID = "{0A9007C6-4076-11D3-8789-0000F8105754}"
+
+def packguid(guid):
+    values = guid[1:9], guid[10:14], guid[15:19], \
+        guid[20:22], guid[22:24], guid[25:27], guid[27:29], \
+        guid[29:31], guid[31:33], guid[33:35], guid[35:37]
+    values = [int(value, 16) for value in values]
+    return pack("<LHHBBBBBBBB", *values)
+
+FLAG_OPENING = (1 << 0)
+FLAG_CLOSING = (1 << 1)
+FLAG_BLOCK = (1 << 2)
+FLAG_HEAD = (1 << 3)
+FLAG_ATOM = (1 << 4)
+FLAG_CUSTOM  = (1 << 15)
+ATTR_NUMBER  = 0xffff
+
+PIECE_SIZE = 16
+PRIMARY_SIZE = 40
+SECONDARY_SIZE = 232
+DCHUNK_SIZE = 0x2000
+CCHUNK_SIZE = 0x0200
+ULL_NEG1 = 0xffffffffffffffff
+ROOT_OFFSET = 1284508585713721976
+ROOT_SIZE = 4165955342166943123
+
+BLOCK_CAOL = \
+    "\x43\x41\x4f\x4c\x02\x00\x00\x00" \
+    "\x50\x00\x00\x00\x37\x13\x03\x00" \
+    "\x00\x00\x00\x00\x00\x20\x00\x00" \
+    "\x00\x02\x00\x00\x00\x00\x10\x00" \
+    "\x00\x00\x02\x00\x00\x00\x00\x00" \
+    "\x00\x00\x00\x00\x00\x00\x00\x00"
+BLOCK_ITSF = \
+    "\x49\x54\x53\x46\x04\x00\x00\x00" \
+    "\x20\x00\x00\x00\x01\x00\x00\x00"
+
+MSDES_CONTROL = \
+    "\x03\x00\x00\x00\x29\x17\x00\x00" \
+    "\x01\x00\x00\x00\xa5\xa5\x00\x00"
+LZXC_CONTROL = \
+    "\x07\x00\x00\x00\x4c\x5a\x58\x43" \
+    "\x03\x00\x00\x00\x04\x00\x00\x00" \
+    "\x04\x00\x00\x00\x02\x00\x00\x00" \
+    "\x00\x00\x00\x00\x00\x00\x00\x00"
+
+COLLAPSE = re.compile(r'[ \t\r\n\v]+')
+
+def prefixname(name, nsrmap):
+    prefix = nsrmap[namespace(name)]
+    if not prefix:
+        return barename(name)
+    return ':'.join((prefix, barename(name)))
+
+def decint(value):
+    bytes = []
+    while True:
+        b = value & 0x7f
+        value >>= 7
+        if bytes:
+            b |= 0x80
+        bytes.append(chr(b))
+        if value == 0:
+            break
+    return ''.join(reversed(bytes))
+
+def randbytes(n):
+    return ''.join(chr(random.randint(0, 255)) for x in xrange(n))
+
+def warn(x):
+    print x
+
+class ReBinary(object):
+    NSRMAP = {'': None, XML_NS: 'xml'}
+    
+    def __init__(self, root, path, oeb, map=HTML_MAP, logger=FauxLogger()):
+        self.path = path
+        self.logger = logger
+        self.dir = os.path.dirname(path)
+        self.manifest = oeb.manifest
+        self.tags, self.tattrs = map
+        self.buf = StringIO()
+        self.anchors = []
+        self.page_breaks = []
+        self.is_html  = is_html = map is HTML_MAP
+        self.stylizer = Stylizer(root, path, oeb) if is_html else None
+        self.tree_to_binary(root)
+        self.content = self.buf.getvalue()
+        self.ahc = self.build_ahc() if is_html else None
+        self.aht = self.build_aht() if is_html else None
+
+    def write(self, *values):
+        for value in values:
+            if isinstance(value, (int, long)):
+                value = unichr(value)
+            self.buf.write(value.encode('utf-8'))
+
+    def is_block(self, style):
+        return style['display'] not in ('inline', 'inline-block')
+            
+    def tree_to_binary(self, elem, nsrmap=NSRMAP, parents=[],
+                       inhead=False, preserve=False):
+        if not isinstance(elem.tag, basestring):
+            self.write(etree.tostring(elem))
+            return
+        nsrmap = copy.copy(nsrmap)
+        attrib = dict(elem.attrib)
+        style = self.stylizer.style(elem) if self.stylizer else None
+        for key, value in elem.nsmap.items():
+            if value not in nsrmap or nsrmap[value] != key:
+                xmlns = ('xmlns:' + key) if key else 'xmlns'
+                attrib[xmlns] = value
+            nsrmap[value] = key
+        tag = prefixname(elem.tag, nsrmap)
+        tag_offset = self.buf.tell()
+        if tag == 'head':
+            inhead = True
+        flags = FLAG_OPENING
+        if not elem.text and len(elem) == 0:
+            flags |= FLAG_CLOSING
+        if inhead:
+            flags |= FLAG_HEAD
+        if style and self.is_block(style):
+            flags |= FLAG_BLOCK
+        self.write(0, flags)
+        tattrs = self.tattrs[0]
+        if tag in self.tags:
+            index = self.tags[tag]
+            self.write(index)
+            if self.tattrs[index]:
+                tattrs = self.tattrs[index]
+        else:
+            self.write(FLAG_CUSTOM, len(tag)+1, tag)
+        last_break = self.page_breaks[-1][0] if self.page_breaks else None
+        if style and last_break != tag_offset \
+           and style['page-break-before'] not in ('avoid', 'auto'):
+            self.page_breaks.append((tag_offset, list(parents)))
+        for attr, value in attrib.items():
+            attr = prefixname(attr, nsrmap)
+            if attr in ('href', 'src'):
+                value = urlnormalize(value)
+                path, frag = urldefrag(value)
+                prefix = unichr(3)
+                if path in self.manifest.hrefs:
+                    prefix = unichr(2)
+                    value = self.manifest.hrefs[path].id
+                    if frag:
+                        value = '#'.join((value, frag))
+                value = prefix + value
+            elif attr in ('id', 'name'):
+                self.anchors.append((value, tag_offset))
+            elif attr.startswith('ms--'):
+                attr = '%' + attr[4:]
+            elif tag == 'link' and attr == 'type' and value in OEB_STYLES:
+                value = OEB_CSS_MIME
+            if attr in tattrs:
+                self.write(tattrs[attr])
+            else:
+                self.write(FLAG_CUSTOM, len(attr)+1, attr)
+            try:
+                self.write(ATTR_NUMBER, int(value)+1)
+            except ValueError:
+                self.write(len(value)+1, value)
+        self.write(0)
+        old_preserve = preserve
+        if style:
+            preserve = (style['white-space'] in ('pre', 'pre-wrap'))
+        xml_space = elem.get(XML('space'))
+        if xml_space == 'preserve':
+            preserve = True
+        elif xml_space == 'normal':
+            preserve = False
+        if elem.text:
+            if preserve:
+                self.write(elem.text)
+            elif len(elem) == 0 or not elem.text.isspace():
+                self.write(COLLAPSE.sub(' ', elem.text))
+            # else: de nada
+        parents.append(tag_offset)
+        child = cstyle = nstyle = None
+        for next in chain(elem, [None]):
+            if self.stylizer:
+                nstyle = None if next is None else self.stylizer.style(next)
+            if child is not None:
+                if not preserve \
+                   and (inhead or not nstyle
+                        or self.is_block(cstyle)
+                        or self.is_block(nstyle)) \
+                   and child.tail and child.tail.isspace():
+                    child.tail = None
+                self.tree_to_binary(child, nsrmap, parents, inhead, preserve)
+            child, cstyle = next, nstyle
+        parents.pop()
+        preserve = old_preserve
+        if not flags & FLAG_CLOSING:
+            self.write(0, (flags & ~FLAG_OPENING) | FLAG_CLOSING, 0)
+        if elem.tail and tag != 'html':
+            tail = elem.tail
+            if not preserve:
+                tail = COLLAPSE.sub(' ', tail)
+            self.write(tail)
+        if style and style['page-break-after'] not in ('avoid', 'auto'):
+            self.page_breaks.append((self.buf.tell(), list(parents)))
+
+    def build_ahc(self):
+        if len(self.anchors) > 6:
+            self.logger.log_warn("More than six anchors in file %r. " \
+                "Some links may not work properly." % self.path)
+        data = StringIO()
+        data.write(unichr(len(self.anchors)).encode('utf-8'))
+        for anchor, offset in self.anchors:
+            data.write(unichr(len(anchor)).encode('utf-8'))
+            data.write(anchor)
+            data.write(pack('<I', offset))
+        return data.getvalue()
+
+    def build_aht(self):
+        return pack('<I', 0)
+
+
+def preserve(function):
+    def wrapper(self, *args, **kwargs):
+        opos = self._stream.tell()
+        try:
+            return function(self, *args, **kwargs)
+        finally:
+            self._stream.seek(opos)
+    functools.update_wrapper(wrapper, function)
+    return wrapper
+    
+class LitWriter(object):
+    def __init__(self, oeb, logger=FauxLogger()):
+        self._oeb = oeb
+        self._logger = logger
+        self._litize_oeb()
+
+    def _litize_oeb(self):
+        oeb = self._oeb
+        oeb.metadata.add('calibre-oeb2lit-version', calibre.__version__)
+        cover = None
+        if oeb.metadata.cover:
+            id = str(oeb.metadata.cover[0])
+            cover = oeb.manifest[id]
+        elif MS_COVER_TYPE in oeb.guide:
+            href = oeb.guide[MS_COVER_TYPE].href
+            cover = oeb.manifest.hrefs[href]
+        elif 'cover' in oeb.guide:
+            href = oeb.guide['cover'].href
+            cover = oeb.manifest.hrefs[href]
+        else:
+            html = oeb.spine[0].data
+            imgs = xpath(html, '//img[position()=1]')
+            href = imgs[0].get('src') if imgs else None
+            cover = oeb.manifest.hrefs[href] if href else None
+        if cover:
+            if not oeb.metadata.cover:
+                oeb.metadata.add('cover', cover.id)
+            for type, title in ALL_MS_COVER_TYPES:
+                if type not in oeb.guide:
+                    oeb.guide.add(type, title, cover.href)
+        else:
+            self._logger.log_warn('No suitable cover image found.')
+
+    def dump(self, stream):
+        self._stream = stream
+        self._sections = [StringIO() for i in xrange(4)]
+        self._directory = []
+        self._meta = None
+        self._dump()
+        
+    def _write(self, *data):
+        for datum in data:
+            self._stream.write(datum)
+
+    @preserve
+    def _writeat(self, pos, *data):
+        self._stream.seek(pos)
+        self._write(*data)
+
+    def _tell(self):
+        return self._stream.tell()
+        
+    def _dump(self):
+        # Build content sections
+        self._build_sections()
+
+        # Build directory chunks
+        dcounts, dchunks, ichunk = self._build_dchunks()
+
+        # Write headers
+        self._write(LIT_MAGIC)
+        self._write(pack('<IIII',
+            1, PRIMARY_SIZE, 5, SECONDARY_SIZE))
+        self._write(packguid(LITFILE_GUID))
+        offset = self._tell()
+        pieces = list(xrange(offset, offset + (PIECE_SIZE * 5), PIECE_SIZE))
+        self._write((5 * PIECE_SIZE) * '\0')
+        aoli1 = len(dchunks) if ichunk else ULL_NEG1
+        last = len(dchunks) - 1
+        ddepth = 2 if ichunk else 1
+        self._write(pack('<IIQQQQIIIIQIIQQQQIIIIQIIIIQ',
+            2, 0x98, aoli1, 0, last, 0, DCHUNK_SIZE, 2, 0, ddepth, 0,
+            len(self._directory), 0, ULL_NEG1, 0, 0, 0, CCHUNK_SIZE, 2,
+            0, 1, 0, len(dcounts), 0, 0x100000, 0x20000, 0))
+        self._write(BLOCK_CAOL)
+        self._write(BLOCK_ITSF)
+        conoff_offset = self._tell()
+        timestamp = int(time.time())
+        self._write(pack('<QII', 0, timestamp, 0x409))
+
+        # Piece #0
+        piece0_offset = self._tell()
+        self._write(pack('<II', 0x1fe, 0))
+        filesz_offset = self._tell()
+        self._write(pack('<QQ', 0, 0))
+        self._writeat(pieces[0], pack('<QQ',
+            piece0_offset, self._tell() - piece0_offset))
+
+        # Piece #1: Directory chunks
+        piece1_offset = self._tell()
+        number = len(dchunks) + ((ichunk and 1) or 0)
+        self._write('IFCM', pack('<IIIQQ',
+            1, DCHUNK_SIZE, 0x100000, ULL_NEG1, number))
+        for dchunk in dchunks:
+            self._write(dchunk)
+        if ichunk:
+            self._write(ichunk)
+        self._writeat(pieces[1], pack('<QQ',
+            piece1_offset, self._tell() - piece1_offset))
+
+        # Piece #2: Count chunks
+        piece2_offset = self._tell()
+        self._write('IFCM', pack('<IIIQQ',
+            1, CCHUNK_SIZE, 0x20000, ULL_NEG1, 1))
+        cchunk = StringIO()
+        last = 0
+        for i, dcount in izip(count(), dcounts):
+            cchunk.write(decint(last))
+            cchunk.write(decint(dcount))
+            cchunk.write(decint(i))
+            last = dcount
+        cchunk = cchunk.getvalue()
+        rem = CCHUNK_SIZE - (len(cchunk) + 50)
+        self._write('AOLL', pack('<IQQQQQ',
+            rem, 0, ULL_NEG1, ULL_NEG1, 0, 1))
+        filler = '\0' * rem
+        self._write(cchunk, filler, pack('<H', len(dcounts)))
+        self._writeat(pieces[2], pack('<QQ',
+            piece2_offset, self._tell() - piece2_offset))
+        
+        # Piece #3: GUID3
+        piece3_offset = self._tell()
+        self._write(packguid(PIECE3_GUID))
+        self._writeat(pieces[3], pack('<QQ',
+            piece3_offset, self._tell() - piece3_offset))
+        
+        # Piece #4: GUID4
+        piece4_offset = self._tell()
+        self._write(packguid(PIECE4_GUID))
+        self._writeat(pieces[4], pack('<QQ',
+            piece4_offset, self._tell() - piece4_offset))
+
+        # The actual section content
+        content_offset = self._tell()
+        self._writeat(conoff_offset, pack('<Q', content_offset))
+        self._write(self._sections[0].getvalue())
+        self._writeat(filesz_offset, pack('<Q', self._tell()))
+
+    def _add_file(self, name, data, secnum=0):
+        if len(data) > 0:
+            section = self._sections[secnum]
+            offset = section.tell()
+            section.write(data)
+        else:
+            offset = 0
+        self._directory.append(
+            DirectoryEntry(name, secnum, offset, len(data)))
+
+    def _add_folder(self, name, offset=0, size=0):
+        if not name.endswith('/'):
+            name += '/'
+        self._directory.append(
+            DirectoryEntry(name, 0, offset, size))
+
+    def _djoin(self, *names):
+        return '/'.join(names)
+        
+    def _build_sections(self):
+        self._add_folder('/', ROOT_OFFSET, ROOT_SIZE)
+        self._build_data()
+        self._build_manifest()
+        self._build_page_breaks()
+        self._build_meta()
+        self._build_drm_storage()
+        self._build_version()
+        self._build_namelist()
+        self._build_storage()
+        self._build_transforms()
+
+    def _build_data(self):
+        self._add_folder('/data')
+        for item in self._oeb.manifest.values():
+            if item.media_type not in LIT_MIMES:
+                self._logger.log_warn("File %r of unknown media-type %r " \
+                    "excluded from output." % (item.href, item.media_type))
+                continue
+            name = '/data/' + item.id
+            data = item.data
+            secnum = 0
+            if not isinstance(data, basestring):
+                self._add_folder(name)
+                rebin = ReBinary(data, item.href, self._oeb, map=HTML_MAP,
+                                 logger=self._logger)
+                self._add_file(name + '/ahc', rebin.ahc, 0)
+                self._add_file(name + '/aht', rebin.aht, 0)
+                item.page_breaks = rebin.page_breaks
+                data = rebin.content
+                name = name + '/content'
+                secnum = 1
+            self._add_file(name, data, secnum)
+            item.size = len(data)
+
+    def _build_manifest(self):
+        states = ['linear', 'nonlinear', 'css', 'images']
+        manifest = dict((state, []) for state in states)
+        for item in self._oeb.manifest.values():
+            if item.spine_position is not None:
+                key = 'linear' if item.linear else 'nonlinear'
+                manifest[key].append(item)
+            elif item.media_type == CSS_MIME:
+                manifest['css'].append(item)
+            elif item.media_type in LIT_IMAGES:
+                manifest['images'].append(item)
+        data = StringIO()
+        data.write(pack('<Bc', 1, '\\'))
+        offset = 0
+        for state in states:
+            items = manifest[state]
+            items.sort()
+            data.write(pack('<I', len(items)))
+            for item in items:
+                id, media_type = item.id, item.media_type
+                href = urlunquote(item.href)
+                item.offset = offset \
+                    if state in ('linear', 'nonlinear') else 0
+                data.write(pack('<I', item.offset))
+                entry = [unichr(len(id)), unicode(id),
+                         unichr(len(href)), unicode(href),
+                         unichr(len(media_type)), unicode(media_type)]
+                for value in entry:
+                    data.write(value.encode('utf-8'))
+                data.write('\0')
+                offset += item.size
+        self._add_file('/manifest', data.getvalue())
+
+    def _build_page_breaks(self):
+        pb1 = StringIO()
+        pb2 = StringIO()
+        pb3 = StringIO()
+        pb3cur = 0
+        bits = 0
+        for item in self._oeb.spine:
+            page_breaks = copy.copy(item.page_breaks)
+            if not item.linear:
+                page_breaks.insert(0, (0, []))
+            for pbreak, parents in page_breaks:
+                pb3cur = (pb3cur << 2) | 1
+                if len(parents) > 1:
+                    pb3cur |= 0x2
+                bits += 2
+                if bits >= 8:
+                    pb3.write(pack('<B', pb3cur))
+                    pb3cur = 0
+                    bits = 0
+                pbreak += item.offset
+                pb1.write(pack('<II', pbreak, pb2.tell()))
+                pb2.write(pack('<I', len(parents)))
+                for parent in parents:
+                    pb2.write(pack('<I', parent))
+        if bits != 0:
+            pb3cur <<= (8 - bits)
+            pb3.write(pack('<B', pb3cur))
+        self._add_file('/pb1', pb1.getvalue(), 0)
+        self._add_file('/pb2', pb2.getvalue(), 0)
+        self._add_file('/pb3', pb3.getvalue(), 0)
+        
+    def _build_meta(self):
+        _, meta = self._oeb.to_opf1()[OPF_MIME]
+        meta.attrib['ms--minimum_level'] = '0'
+        meta.attrib['ms--attr5'] = '1'
+        meta.attrib['ms--guid'] = '{%s}' % str(uuid.uuid4()).upper()
+        rebin = ReBinary(meta, 'content.opf', self._oeb, map=OPF_MAP,
+                         logger=self._logger)
+        meta = rebin.content
+        self._meta = meta
+        self._add_file('/meta', meta)
+        
+    def _build_drm_storage(self):
+        drmsource = u'Free as in freedom\0'.encode('utf-16-le')
+        self._add_file('/DRMStorage/DRMSource', drmsource)
+        tempkey = self._calculate_deskey([self._meta, drmsource])
+        msdes.deskey(tempkey, msdes.EN0)
+        self._add_file('/DRMStorage/DRMSealed', msdes.des("\0" * 16))
+        self._bookkey = '\0' * 8
+        self._add_file('/DRMStorage/ValidationStream', 'MSReader', 3)
+
+    def _build_version(self):
+        self._add_file('/Version', pack('<HH', 8, 1))
+
+    def _build_namelist(self):
+        data = StringIO()
+        data.write(pack('<HH', 0x3c, len(self._sections)))
+        names = ['Uncompressed', 'MSCompressed', 'EbEncryptDS',
+                 'EbEncryptOnlyDS']
+        for name in names:
+            data.write(pack('<H', len(name)))
+            data.write(name.encode('utf-16-le'))
+            data.write('\0\0')
+        self._add_file('::DataSpace/NameList', data.getvalue())
+
+    def _build_storage(self):
+        mapping = [(1, 'MSCompressed', (LZXCOMPRESS_GUID,)),
+                   (2, 'EbEncryptDS', (LZXCOMPRESS_GUID, DESENCRYPT_GUID)),
+                   (3, 'EbEncryptOnlyDS', (DESENCRYPT_GUID,)),]
+        for secnum, name, transforms in mapping:
+            root = '::DataSpace/Storage/' + name
+            data = self._sections[secnum].getvalue()
+            cdata, sdata, tdata, rdata = '', '', '', ''
+            for guid in transforms:
+                tdata = packguid(guid) + tdata
+                sdata = sdata + pack('<Q', len(data))
+                if guid == DESENCRYPT_GUID:
+                    cdata = MSDES_CONTROL + cdata
+                    if not data: continue
+                    msdes.deskey(self._bookkey, msdes.EN0)
+                    pad = 8 - (len(data) & 0x7)
+                    if pad != 8:
+                        data = data + ('\0' * pad)
+                    data = msdes.des(data)
+                elif guid == LZXCOMPRESS_GUID:
+                    cdata = LZXC_CONTROL + cdata
+                    if not data: continue
+                    unlen = len(data)
+                    lzx = Compressor(17)
+                    data, rtable = lzx.compress(data, flush=True)
+                    rdata = StringIO()
+                    rdata.write(pack('<IIIIQQQQ',
+                        3, len(rtable), 8, 0x28, unlen, len(data), 0x8000, 0))
+                    for uncomp, comp in rtable[:-1]:
+                        rdata.write(pack('<Q', comp))
+                    rdata = rdata.getvalue()
+            self._add_file(root + '/Content', data)
+            self._add_file(root + '/ControlData', cdata)
+            self._add_file(root + '/SpanInfo', sdata)
+            self._add_file(root + '/Transform/List', tdata)
+            troot = root + '/Transform'
+            for guid in transforms:
+                dname = self._djoin(troot, guid, 'InstanceData')
+                self._add_folder(dname)
+                if guid == LZXCOMPRESS_GUID:
+                    dname += '/ResetTable'
+                    self._add_file(dname, rdata)
+
+    def _build_transforms(self):
+        for guid in (LZXCOMPRESS_GUID, DESENCRYPT_GUID):
+            self._add_folder('::Transform/'+ guid)
+    
+    def _calculate_deskey(self, hashdata):
+        prepad = 2
+        hash = mssha1.new()
+        for data in hashdata:
+            if prepad > 0:
+                data = ("\000" * prepad) + data
+                prepad = 0
+            postpad = 64 - (len(data) % 64)
+            if postpad < 64:
+                data = data + ("\000" * postpad)
+            hash.update(data)
+        digest = hash.digest()
+        key = [0] * 8
+        for i in xrange(0, len(digest)):
+            key[i % 8] ^= ord(digest[i])
+        return ''.join(chr(x) for x in key)
+    
+    def _build_dchunks(self):
+        ddata = []
+        directory = list(self._directory)
+        directory.sort(cmp=lambda x, y: \
+            cmp(x.name.lower(), y.name.lower()))
+        qrn = 1 + (1 << 2)
+        dchunk = StringIO()
+        dcount = 0
+        quickref = []
+        name = directory[0].name
+        for entry in directory:
+            next = ''.join([decint(len(entry.name)), entry.name,
+                decint(entry.section), decint(entry.offset),
+                decint(entry.size)])
+            usedlen = dchunk.tell() + len(next) + (len(quickref) * 2) + 52
+            if usedlen >= DCHUNK_SIZE:
+                ddata.append((dchunk.getvalue(), quickref, dcount, name))
+                dchunk = StringIO()
+                dcount = 0
+                quickref = []
+                name = entry.name
+            if (dcount % qrn) == 0:
+                quickref.append(dchunk.tell())
+            dchunk.write(next)
+            dcount = dcount + 1
+        ddata.append((dchunk.getvalue(), quickref, dcount, name))
+        cidmax = len(ddata) - 1
+        rdcount = 0
+        dchunks = []
+        dcounts = []
+        ichunk = None
+        if len(ddata) > 1:
+            ichunk = StringIO()
+        for cid, (content, quickref, dcount, name) in izip(count(), ddata):
+            dchunk = StringIO()
+            prev = cid - 1 if cid > 0 else ULL_NEG1
+            next = cid + 1 if cid < cidmax else ULL_NEG1
+            rem = DCHUNK_SIZE - (len(content) + 50)
+            pad = rem - (len(quickref) * 2)
+            dchunk.write('AOLL')
+            dchunk.write(pack('<IQQQQQ', rem, cid, prev, next, rdcount, 1))
+            dchunk.write(content)
+            dchunk.write('\0' * pad)
+            for ref in reversed(quickref):
+                dchunk.write(pack('<H', ref))
+            dchunk.write(pack('<H', dcount))
+            rdcount = rdcount + dcount
+            dchunks.append(dchunk.getvalue())
+            dcounts.append(dcount)
+            if ichunk:
+                ichunk.write(decint(len(name)))
+                ichunk.write(name)
+                ichunk.write(decint(cid))
+        if ichunk:
+            rem = DCHUNK_SIZE - (ichunk.tell() + 16)
+            pad = rem - 2
+            ichunk = ''.join(['AOLI', pack('<IQ', rem, len(dchunks)),
+                ichunk.getvalue(), ('\0' * pad), pack('<H', len(dchunks))])
+        return dcounts, dchunks, ichunk
+
+
+def option_parser():
+    from calibre.utils.config import OptionParser
+    parser = OptionParser(usage=_('%prog [options] OPFFILE'))
+    parser.add_option(
+        '-o', '--output', default=None, 
+        help=_('Output file. Default is derived from input filename.'))
+    parser.add_option(
+        '--verbose', default=False, action='store_true',
+        help=_('Useful for debugging.'))
+    return parser
+
+def oeb2lit(opts, opfpath):
+    logger = LoggingInterface(logging.getLogger('oeb2lit'))
+    logger.setup_cli_handler(opts.verbose)
+    litpath = opts.output
+    if litpath is None:
+        litpath = os.path.basename(opfpath)
+        litpath = os.path.splitext(litpath)[0] + '.lit'
+    litpath = os.path.abspath(litpath)
+    lit = LitWriter(OEBBook(opfpath, logger=logger), logger=logger)
+    with open(litpath, 'wb') as f:
+        lit.dump(f)
+    run_plugins_on_postprocess(litpath, 'lit')
+    logger.log_info(_('Output written to ')+litpath)
+    
+
+def main(argv=sys.argv):
+    parser = option_parser()
+    opts, args = parser.parse_args(argv[1:])
+    if len(args) != 1:
+        parser.print_help()
+        return 1
+    opfpath = args[0]
+    oeb2lit(opts, opfpath)
+    return 0
+    
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py
index 7c195f96e4..73a261b931 100644
--- a/src/calibre/ebooks/lrf/__init__.py
+++ b/src/calibre/ebooks/lrf/__init__.py
@@ -108,6 +108,8 @@ def option_parser(usage, gui_mode=False):
                       help=_('Add a header to all the pages with title and author.'))
     laf.add_option('--headerformat', default="%t by %a", dest='headerformat', type='string',
                         help=_('Set the format of the header. %a is replaced by the author and %t by the title. Default is %default'))
+    laf.add_option('--header-separation', default=0, type='int', 
+                   help=_('Add extra spacing below the header. Default is %default px.'))
     laf.add_option('--override-css', default=None, dest='_override_css', type='string',
                    help=_('Override the CSS. Can be either a path to a CSS stylesheet or a string. If it is a string it is interpreted as CSS.'))
     laf.add_option('--use-spine', default=False, dest='use_spine', action='store_true',
@@ -260,10 +262,11 @@ def Book(options, logger, font_delta=0, header=None,
         hb.append(header)
         hdr.PutObj(hb)
         ps['headheight'] = profile.header_height
+        ps['headsep']    = options.header_separation
         ps['header']     = hdr
         ps['topmargin']  = 0
         ps['textheight'] = profile.screen_height - (options.bottom_margin + ps['topmargin']) \
-                                                 - ps['headheight'] - profile.fudge
+                                                 - ps['headheight'] - ps['headsep'] - profile.fudge
         
     fontsize = int(10*profile.font_size+font_delta*20)
     baselineskip = fontsize + 20
diff --git a/src/calibre/ebooks/lrf/any/convert_from.py b/src/calibre/ebooks/lrf/any/convert_from.py
index 710fbe1690..002064bced 100644
--- a/src/calibre/ebooks/lrf/any/convert_from.py
+++ b/src/calibre/ebooks/lrf/any/convert_from.py
@@ -18,6 +18,8 @@ from calibre.ebooks.lrf.epub.convert_from import process_file as epub2lrf
 from calibre.ebooks.lrf.mobi.convert_from import process_file as mobi2lrf
 from calibre.ebooks.lrf.fb2.convert_from  import process_file as fb22lrf
 
+from calibre.customize.ui import run_plugins_on_postprocess, run_plugins_on_preprocess
+
 def largest_file(files):
     maxsize, file = 0, None
     for f in files:
@@ -108,6 +110,7 @@ def odt2lrf(path, options, logger):
 
 def process_file(path, options, logger=None):
     path = os.path.abspath(os.path.expanduser(path))
+    path = run_plugins_on_preprocess(path)
     tdir = None
     if logger is None:
         level = logging.DEBUG if options.verbose else logging.INFO
@@ -160,6 +163,7 @@ def process_file(path, options, logger=None):
         if not convertor:
             raise UnknownFormatError(_('Converting from %s to LRF is not supported.')%ext)
         convertor(path, options, logger)
+        
     finally:
         os.chdir(cwd)
         if tdir and os.path.exists(tdir):
diff --git a/src/calibre/ebooks/lrf/comic/convert_from.py b/src/calibre/ebooks/lrf/comic/convert_from.py
index a3597bfaa8..70b4eb8b43 100755
--- a/src/calibre/ebooks/lrf/comic/convert_from.py
+++ b/src/calibre/ebooks/lrf/comic/convert_from.py
@@ -10,6 +10,14 @@ Based on ideas from comiclrf created by FangornUK.
 import os, sys, shutil, traceback, textwrap
 from uuid import uuid4
 
+try:
+	from reportlab.pdfgen import canvas
+	_reportlab = True
+except:
+	_reportlab = False
+
+
+
 from calibre import extract, terminal_controller, __appname__, __version__
 from calibre.utils.config import Config, StringConfig
 from calibre.ptempfile import PersistentTemporaryDirectory
@@ -19,6 +27,7 @@ from calibre.ebooks.lrf.pylrs.pylrs import Book, BookSetting, ImageStream, Image
 from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.metadata.opf import OPFCreator
 from calibre.ebooks.epub.from_html import config as html2epub_config, convert as html2epub
+from calibre.customize.ui import run_plugins_on_preprocess
 try:
     from calibre.utils.PythonMagickWand import \
             NewMagickWand, NewPixelWand, \
@@ -41,6 +50,8 @@ except:
 PROFILES = {
             # Name : (width, height) in pixels
             'prs500':(584, 754),
+            # The SONY's LRF renderer (on the PRS500) only uses the first 800x600 block of the image 
+            'prs500-landscape': (784, 1200-92)
             }
 
 def extract_comic(path_to_comic_file):
@@ -276,7 +287,7 @@ def process_pages(pages, opts, update):
         failures += failures_
     return ans, failures, tdir
     
-def config(defaults=None):
+def config(defaults=None,output_format='lrf'):
     desc = _('Options to control the conversion of comics (CBR, CBZ) files into ebooks')
     if defaults is None:
         c = Config('comic', desc)
@@ -313,10 +324,13 @@ def config(defaults=None):
               help=_('Be verbose, useful for debugging. Can be specified multiple times for greater verbosity.'))
     c.add_opt('no_progress_bar', ['--no-progress-bar'], default=False,
                       help=_("Don't show progress bar."))
+    if output_format == 'pdf':
+           c.add_opt('no_process',['--no_process'], default=False,
+    		      help=_("Apply no processing to the image"))
     return c
 
-def option_parser():
-    c = config()
+def option_parser(output_format='lrf'):
+    c = config(output_format=output_format)
     return c.option_parser(usage=_('''\
 %prog [options] comic.cb[z|r]
 
@@ -379,38 +393,60 @@ def create_lrf(pages, profile, opts, thumbnail=None):
     book.renderLrf(open(opts.output, 'wb'))
     print _('Output written to'), opts.output
     
+
+def create_pdf(pages, profile, opts, thumbnail=None):
+    width, height = PROFILES[profile]
+
+    if not _reportlab:
+            raise RuntimeError('Failed to load reportlab')
+
+    pdf = canvas.Canvas(filename=opts.output, pagesize=(width,height+15))
+
+    for page in pages:
+       pdf.drawImage(page, x=0,y=0,width=width, height=height) 
+       pdf.showPage() 
+	 
+    # Write the document to disk
+    pdf.save() 
+
     
 def do_convert(path_to_file, opts, notification=lambda m, p: p, output_format='lrf'):
+    path_to_file = run_plugins_on_preprocess(path_to_file)
     source = path_to_file
+    
     if not opts.title:
         opts.title = os.path.splitext(os.path.basename(source))[0]
     if not opts.output:
         opts.output = os.path.abspath(os.path.splitext(os.path.basename(source))[0]+'.'+output_format)
     tdir  = extract_comic(source)
     pages = find_pages(tdir, sort_on_mtime=opts.no_sort, verbose=opts.verbose)
+    thumbnail = None
     if not pages:
         raise ValueError('Could not find any pages in the comic: %s'%source)
-    pages, failures, tdir2 = process_pages(pages, opts, notification)
-    if not pages:
-        raise ValueError('Could not find any valid pages in the comic: %s'%source)
-    if failures:
-        print 'Could not process the following pages (run with --verbose to see why):'
-        for f in failures:
-            print '\t', f
-    thumbnail = os.path.join(tdir2, 'thumbnail.png')
-    if not os.access(thumbnail, os.R_OK):
-        thumbnail = None
-    
+    if not opts.no_process:
+       pages, failures, tdir2 = process_pages(pages, opts, notification)
+       if not pages:
+          raise ValueError('Could not find any valid pages in the comic: %s'%source)
+       if failures:
+          print 'Could not process the following pages (run with --verbose to see why):'
+          for f in failures:
+              print '\t', f
+       thumbnail = os.path.join(tdir2, 'thumbnail.png')
+       if not os.access(thumbnail, os.R_OK):
+          thumbnail = None
     if output_format == 'lrf':
         create_lrf(pages, opts.profile, opts, thumbnail=thumbnail)
-    else:
+    if output_format == 'epub':
         create_epub(pages, opts.profile, opts, thumbnail=thumbnail)
+    if output_format == 'pdf':
+	create_pdf(pages, opts.profile, opts, thumbnail=thumbnail)
     shutil.rmtree(tdir)
-    shutil.rmtree(tdir2)
+    if not opts.no_process:
+        shutil.rmtree(tdir2)
 
 
 def main(args=sys.argv, notification=None, output_format='lrf'):
-    parser = option_parser()
+    parser = option_parser(output_format=output_format)
     opts, args = parser.parse_args(args)
     if len(args) < 2:
         parser.print_help()
@@ -424,7 +460,6 @@ def main(args=sys.argv, notification=None, output_format='lrf'):
     
     source = os.path.abspath(args[1])
     do_convert(source, opts, notification, output_format=output_format)
-    
     return 0
 
 if __name__ == '__main__':
diff --git a/src/calibre/ebooks/lrf/epub/convert_from.py b/src/calibre/ebooks/lrf/epub/convert_from.py
index 071a2cb497..c564930ea5 100644
--- a/src/calibre/ebooks/lrf/epub/convert_from.py
+++ b/src/calibre/ebooks/lrf/epub/convert_from.py
@@ -2,14 +2,14 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
 import os, sys, shutil, logging
-from tempfile import mkdtemp
 from calibre.ebooks.lrf import option_parser as lrf_option_parser
 from calibre.ebooks import ConversionError, DRMError
 from calibre.ebooks.lrf.html.convert_from import process_file as html_process_file
 from calibre.ebooks.metadata.opf import OPF
 from calibre.ebooks.metadata.epub import OCFDirReader
 from calibre.utils.zipfile import ZipFile
-from calibre import __appname__, setup_cli_handlers
+from calibre import setup_cli_handlers
+from calibre.ptempfile import PersistentTemporaryDirectory
 
 
 def option_parser():
@@ -22,17 +22,16 @@ _('''Usage: %prog [options] mybook.epub
 
 def generate_html(pathtoepub, logger):
     if not os.access(pathtoepub, os.R_OK):
-        raise ConversionError, 'Cannot read from ' + pathtoepub
-    tdir = mkdtemp(prefix=__appname__+'_')
-    os.rmdir(tdir)
+        raise ConversionError('Cannot read from ' + pathtoepub)
+    tdir = PersistentTemporaryDirectory('_epub2lrf')
+    #os.rmdir(tdir)
     try:
         ZipFile(pathtoepub).extractall(tdir)
-        if os.path.exists(os.path.join(tdir, 'META-INF', 'encryption.xml')):
-            raise DRMError(os.path.basename(pathtoepub))
     except:
-        if os.path.exists(tdir) and os.path.isdir(tdir):
-            shutil.rmtree(tdir)
         raise ConversionError, '.epub extraction failed'
+    if os.path.exists(os.path.join(tdir, 'META-INF', 'encryption.xml')):
+            raise DRMError(os.path.basename(pathtoepub))
+    
     return tdir
 
 def process_file(path, options, logger=None):
diff --git a/src/calibre/ebooks/lrf/fonts/__init__.py b/src/calibre/ebooks/lrf/fonts/__init__.py
index ebd022bdd3..25ef8433b5 100644
--- a/src/calibre/ebooks/lrf/fonts/__init__.py
+++ b/src/calibre/ebooks/lrf/fonts/__init__.py
@@ -12,24 +12,61 @@ except ImportError:
 '''
 Default fonts used in the PRS500
 '''
-from calibre.ebooks.lrf.fonts.prs500 import tt0003m_, tt0011m_, tt0419m_
+
+SYSTEM_FONT_PATH = '/usr/share/fonts/truetype/ttf-liberation/'
 
 FONT_MAP = {
-            'Swis721 BT Roman'     : tt0003m_,
-            'Dutch801 Rm BT Roman' : tt0011m_,
-            'Courier10 BT Roman'   : tt0419m_,
+            'Swis721 BT Roman'     : 'tt0003m_',
+            'Dutch801 Rm BT Roman' : 'tt0011m_',
+            'Courier10 BT Roman'   : 'tt0419m_',
             }
+
+LIBERATION_FONT_MAP = {
+            'Swis721 BT Roman'     : 'LiberationSans_Regular',
+            'Dutch801 Rm BT Roman' : 'LiberationSerif_Regular',
+            'Courier10 BT Roman'   : 'LiberationMono_Regular',
+            }
+
+SYSTEM_FONT_MAP = {}
+for key, val in LIBERATION_FONT_MAP.items():
+    SYSTEM_FONT_MAP[key] = SYSTEM_FONT_PATH + val.replace('_', '-') + '.ttf'
+
 FONT_FILE_MAP = {}
 
 def get_font_path(name):
     if FONT_FILE_MAP.has_key(name) and os.access(FONT_FILE_MAP[name].name, os.R_OK):
         return FONT_FILE_MAP[name].name
-    p = PersistentTemporaryFile('.ttf', 'font_')
-    p.write(FONT_MAP[name].font_data)
-    p.close()
-    FONT_FILE_MAP[name] = p
-    return p.name
+
+    # translate font into file name
+    fname = FONT_MAP[name]
+
+    # first, check configuration in /etc/
+    etc_file = os.path.join(os.path.sep, 'etc', 'calibre', 'fonts', fname + '.ttf')
+    if os.access(etc_file, os.R_OK):
+        return etc_file
+
+    # then, try calibre shipped ones
+    try:
+        try:
+            font_mod = __import__('calibre.ebooks.lrf.fonts.prs500', {}, {}, 
+                                  [fname], -1)
+        except ImportError:
+            font_mod = __import__('calibre.ebooks.lrf.fonts.liberation', {}, {}, 
+                                  [LIBERATION_FONT_MAP[name]], -1)
+        p = PersistentTemporaryFile('.ttf', 'font_')
+        p.write(getattr(font_mod, fname).font_data)
+        p.close()
+        FONT_FILE_MAP[name] = p
+        return p.name
+    except ImportError:
+        pass
     
+    # finally, try system default ones
+    if SYSTEM_FONT_MAP.has_key(name) and os.access(SYSTEM_FONT_MAP[name], os.R_OK):
+        return SYSTEM_FONT_MAP[name]
+
+    # not found
+    raise SystemError, 'font %s (in file %s) not installed' % (name, fname)
 
 def get_font(name, size, encoding='unic'):
     '''
diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py
index f219b92c67..292ae0b50b 100644
--- a/src/calibre/ebooks/lrf/html/convert_from.py
+++ b/src/calibre/ebooks/lrf/html/convert_from.py
@@ -12,6 +12,7 @@ from urllib import unquote
 from urlparse import urlparse
 from math import ceil, floor
 from functools import partial
+from calibre.customize.ui import run_plugins_on_postprocess
 
 try:
     from PIL import Image as PILImage
@@ -32,7 +33,6 @@ from calibre.ebooks.lrf.html.table import Table
 from calibre import filename_to_utf8,  setup_cli_handlers, __appname__, \
                     fit_image, LoggingInterface, preferred_encoding
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre.ebooks.metadata.opf import OPFReader
 from calibre.devices.interface import Device
 from calibre.ebooks.lrf.html.color_map import lrs_color
 from calibre.ebooks.chardet import xml_to_unicode
@@ -106,6 +106,8 @@ class HTMLConverter(object, LoggingInterface):
                         (re.compile(r'(<style.*?</style>)', re.IGNORECASE|re.DOTALL),
                          strip_style_comments),
                          
+                        # Remove self closing script tags as they also mess up BeautifulSoup
+                        (re.compile(r'(?i)<script[^<>]+?/>'), lambda match: ''),
                         
                         ]
     # Fix Baen markup
@@ -243,7 +245,6 @@ class HTMLConverter(object, LoggingInterface):
         
         self.override_css = {}
         self.override_pcss = {}
-        self.table_render_job_server = None
          
         if self._override_css is not None:
             if os.access(self._override_css, os.R_OK):
@@ -264,41 +265,37 @@ class HTMLConverter(object, LoggingInterface):
         paths = [os.path.abspath(path) for path in paths]
         paths = [path.decode(sys.getfilesystemencoding()) if not isinstance(path, unicode) else path for path in paths]
         
-        try:
-            while len(paths) > 0 and self.link_level <= self.link_levels:
-                for path in paths:
-                    if path in self.processed_files:
-                        continue
-                    try:
-                        self.add_file(path)
-                    except KeyboardInterrupt:
+        while len(paths) > 0 and self.link_level <= self.link_levels:
+            for path in paths:
+                if path in self.processed_files:
+                    continue
+                try:
+                    self.add_file(path)
+                except KeyboardInterrupt:
+                    raise
+                except:
+                    if self.link_level == 0: # Die on errors in the first level
                         raise
-                    except:
-                        if self.link_level == 0: # Die on errors in the first level
-                            raise
-                        for link in self.links:
-                            if link['path'] == path:
-                                self.links.remove(link)
-                                break
-                        self.log_warn('Could not process '+path)
-                        if self.verbose:
-                            self.log_exception(' ')
-                self.links = self.process_links()
-                self.link_level += 1
-                paths = [link['path'] for link in self.links]
-                
-            if self.current_page is not None and self.current_page.has_text():
-                self.book.append(self.current_page)
-                
-            for text, tb in self.extra_toc_entries:
-                self.book.addTocEntry(text, tb)
-                
-            if self.base_font_size > 0:
-                self.log_info('\tRationalizing font sizes...')
-                self.book.rationalize_font_sizes(self.base_font_size)
-        finally:
-            if self.table_render_job_server is not None:
-                self.table_render_job_server.killall()
+                    for link in self.links:
+                        if link['path'] == path:
+                            self.links.remove(link)
+                            break
+                    self.log_warn('Could not process '+path)
+                    if self.verbose:
+                        self.log_exception(' ')
+            self.links = self.process_links()
+            self.link_level += 1
+            paths = [link['path'] for link in self.links]
+            
+        if self.current_page is not None and self.current_page.has_text():
+            self.book.append(self.current_page)
+            
+        for text, tb in self.extra_toc_entries:
+            self.book.addTocEntry(text, tb)
+            
+        if self.base_font_size > 0:
+            self.log_info('\tRationalizing font sizes...')
+            self.book.rationalize_font_sizes(self.base_font_size)
         
     def is_baen(self, soup):
         return bool(soup.find('meta', attrs={'name':'Publisher', 
@@ -334,7 +331,8 @@ class HTMLConverter(object, LoggingInterface):
                 soup = BeautifulSoup(raw, 
                          convertEntities=BeautifulSoup.XHTML_ENTITIES,
                          markupMassage=nmassage)
-        
+            else:
+                raise
         if not self.baen and self.is_baen(soup):
             self.baen = True
             self.log_info(_('\tBaen file detected. Re-parsing...'))
@@ -520,6 +518,8 @@ class HTMLConverter(object, LoggingInterface):
             self.book.append(self.current_page)
             self.current_page = None
         
+        if top not in top.parent.contents: # May have been removed for a cover image
+            top = top.parent.contents[0]
         if not top.has_text() and top.parent.contents.index(top) == len(top.parent.contents)-1:
             # Empty block at the bottom of a page
             opage = top.parent
@@ -809,7 +809,7 @@ class HTMLConverter(object, LoggingInterface):
         
         def append_text(src):
             fp, key, variant = self.font_properties(css)
-            for x, y in [(u'\xa0', ' '), (u'\ufb00', 'ff'), (u'\ufb01', 'fi'), (u'\ufb02', 'fl'), (u'\ufb03', 'ffi'), (u'\ufb04', 'ffl')]:
+            for x, y in [(u'\xad', ''), (u'\xa0', ' '), (u'\ufb00', 'ff'), (u'\ufb01', 'fi'), (u'\ufb02', 'fl'), (u'\ufb03', 'ffi'), (u'\ufb04', 'ffl')]:
                 src = src.replace(x, y)
             
             valigner = lambda x: x
@@ -1028,6 +1028,8 @@ class HTMLConverter(object, LoggingInterface):
             self.current_para = Paragraph()
         else:
             self.end_page()
+            if len(self.current_page.contents) == 1 and not self.current_page.has_text():
+                self.current_page.contents[0:1] = []
             self.current_page.append(Canvas(width=pwidth,
                                             height=height))
             left = int(floor((pwidth - width)/2.))
@@ -1725,15 +1727,11 @@ class HTMLConverter(object, LoggingInterface):
                 self.process_children(tag, tag_css, tag_pseudo_css)
             elif tagname == 'table' and not self.ignore_tables and not self.in_table:
                 if self.render_tables_as_images:
-                    if self.table_render_job_server is None:
-                        from calibre.parallel import Server
-                        self.table_render_job_server = Server(number_of_workers=1)
                     print 'Rendering table...'
                     from calibre.ebooks.lrf.html.table_as_image import render_table
                     pheight = int(self.current_page.pageStyle.attrs['textheight'])
                     pwidth  = int(self.current_page.pageStyle.attrs['textwidth'])
-                    images = render_table(self.table_render_job_server,
-                                          self.soup, tag, tag_css, 
+                    images = render_table(self.soup, tag, tag_css, 
                                           os.path.dirname(self.target_prefix), 
                                           pwidth, pheight, self.profile.dpi, 
                                           self.text_size_multiplier_for_rendered_tables)
@@ -1846,7 +1844,7 @@ def process_file(path, options, logger=None):
                       scaled else im
                 cf = PersistentTemporaryFile(prefix=__appname__+"_", suffix=".jpg")
                 cf.close()
-                cim.save(cf.name)
+                cim.convert('RGB').save(cf.name)
                 options.cover = cf.name
                 
                 tim = im.resize((int(0.75*th), th), PILImage.ANTIALIAS).convert('RGB')
@@ -1899,6 +1897,8 @@ def process_file(path, options, logger=None):
     fpb = re.compile(options.force_page_break, re.IGNORECASE) if options.force_page_break else \
          re.compile('$')
     cq = options.chapter_attr.split(',')
+    if len(cq) < 3:
+        raise ValueError('The --chapter-attr setting must have 2 commas.')
     options.chapter_attr = [re.compile(cq[0], re.IGNORECASE), cq[1], 
                             re.compile(cq[2], re.IGNORECASE)]
     options.force_page_break = fpb
@@ -1916,7 +1916,7 @@ def process_file(path, options, logger=None):
         options.anchor_ids = True
     files = options.spine if (options.use_spine and hasattr(options, 'spine')) else [path]
     conv = HTMLConverter(book, fonts, options, logger, files)
-    if options.use_spine and hasattr(options, 'toc'):
+    if options.use_spine and hasattr(options, 'toc') and options.toc is not None:
         conv.create_toc(options.toc)
     oname = options.output
     if not oname:
@@ -1925,7 +1925,8 @@ def process_file(path, options, logger=None):
         oname = os.path.join(os.getcwd(), name)
     oname = os.path.abspath(os.path.expanduser(oname))
     conv.writeto(oname, lrs=options.lrs)
-    logger.info('Output written to %s', oname)
+    run_plugins_on_postprocess(oname, 'lrf')
+    conv.log_info('Output written to %s', oname)
     conv.cleanup()
     return oname
     
@@ -1944,7 +1945,8 @@ def try_opf(path, options, logger):
         return
     
     dirpath = os.path.dirname(os.path.abspath(opf))
-    opf = OPFReader(open(opf, 'rb'), dirpath)
+    from calibre.ebooks.metadata.opf2 import OPF as OPF2
+    opf = OPF2(open(opf, 'rb'), dirpath)
     try:
         title = opf.title        
         if title and not getattr(options, 'title', None):
@@ -1958,10 +1960,6 @@ def try_opf(path, options, logger):
             publisher = opf.publisher
             if publisher:
                 options.publisher = publisher
-        if not getattr(options, 'category', None):
-            category = opf.category
-            if category:
-                options.category = category
         if not getattr(options, 'cover', None) or options.use_metadata_cover:
             orig_cover = getattr(options, 'cover', None)
             options.cover = None
@@ -1975,17 +1973,7 @@ def try_opf(path, options, logger):
                         PILImage.open(cover)
                         options.cover = cover
                     except:
-                        for prefix in opf.possible_cover_prefixes():
-                            if options.cover:
-                                break
-                            for suffix in ['.jpg', '.jpeg', '.gif', '.png', '.bmp']:
-                                cpath = os.path.join(os.path.dirname(path), prefix+suffix)
-                                try:
-                                    PILImage.open(cpath)
-                                    options.cover = cpath
-                                    break
-                                except:
-                                    continue
+                        pass
             if not getattr(options, 'cover', None) and orig_cover is not None:
                 options.cover = orig_cover
         if getattr(opf, 'spine', False):
diff --git a/src/calibre/ebooks/lrf/html/table_as_image.py b/src/calibre/ebooks/lrf/html/table_as_image.py
index 7211dc858e..4b40dc5be6 100644
--- a/src/calibre/ebooks/lrf/html/table_as_image.py
+++ b/src/calibre/ebooks/lrf/html/table_as_image.py
@@ -6,14 +6,11 @@ __docformat__ = 'restructuredtext en'
 '''
 Render HTML tables as images.
 '''
-import os, tempfile, atexit, shutil, time
-from PyQt4.Qt import QUrl, QApplication, QSize, \
+import os, tempfile, atexit, shutil
+from PyQt4.Qt import QUrl, QApplication, QSize, QEventLoop, \
                      SIGNAL, QPainter, QImage, QObject, Qt
 from PyQt4.QtWebKit import QWebPage
 
-from calibre.parallel import ParallelJob
-
-__app = None
 
 class HTMLTableRenderer(QObject):
 
@@ -27,13 +24,15 @@ class HTMLTableRenderer(QObject):
         self.app = None
         self.width, self.height, self.dpi = width, height, dpi
         self.base_dir = base_dir
+        self.images = []
+        self.tdir = tempfile.mkdtemp(prefix='calibre_render_table')
+        self.loop = QEventLoop()
         self.page = QWebPage()
         self.connect(self.page, SIGNAL('loadFinished(bool)'), self.render_html)
         self.page.mainFrame().setTextSizeMultiplier(factor)
         self.page.mainFrame().setHtml(html, 
                                 QUrl('file:'+os.path.abspath(self.base_dir)))
-        self.images = []
-        self.tdir = tempfile.mkdtemp(prefix='calibre_render_table')
+        
         
     def render_html(self, ok):
         try:
@@ -63,7 +62,7 @@ class HTMLTableRenderer(QObject):
         finally:
             QApplication.quit()
         
-def render_table(server, soup, table, css, base_dir, width, height, dpi, factor=1.0):
+def render_table(soup, table, css, base_dir, width, height, dpi, factor=1.0):
     head = ''
     for e in soup.findAll(['link', 'style']):
         head += unicode(e)+'\n\n'
@@ -83,24 +82,13 @@ def render_table(server, soup, table, css, base_dir, width, height, dpi, factor=
     </body>
 </html>
     '''%(head, width-10, style, unicode(table))
-    job = ParallelJob('render_table',  lambda j : j, None,
-                            args=[html, base_dir, width, height, dpi, factor])
-    server.add_job(job)
-    while not job.has_run:
-        time.sleep(2)
-    
-    if job.exception is not None:
-        print 'Failed to render table'
-        print job.exception
-        print job.traceback
-    images, tdir = job.result
+    images, tdir = do_render(html, base_dir, width, height, dpi, factor)
     atexit.register(shutil.rmtree, tdir)
     return images
     
 def do_render(html, base_dir, width, height, dpi, factor):
-    app = QApplication.instance()
-    if app is None:
-        app = QApplication([])
+    if QApplication.instance() is None:
+                QApplication([])
     tr = HTMLTableRenderer(html, base_dir, width, height, dpi, factor)
-    app.exec_()
+    tr.loop.exec_()
     return tr.images, tr.tdir
\ No newline at end of file
diff --git a/src/calibre/ebooks/lrf/lrfparser.py b/src/calibre/ebooks/lrf/lrfparser.py
index f24b265a59..d74841515c 100644
--- a/src/calibre/ebooks/lrf/lrfparser.py
+++ b/src/calibre/ebooks/lrf/lrfparser.py
@@ -77,7 +77,7 @@ class LRFDocument(LRFMetaFile):
         for obj in self.image_map.values() + self.font_map.values():
             open(obj.file, 'wb').write(obj.stream)            
         
-    def to_xml(self):
+    def to_xml(self, write_files=True):
         bookinfo = u'<BookInformation>\n<Info version="1.1">\n<BookInfo>\n'
         bookinfo += u'<Title reading="%s">%s</Title>\n'%(self.metadata.title_reading, self.metadata.title)
         bookinfo += u'<Author reading="%s">%s</Author>\n'%(self.metadata.author_reading, self.metadata.author)
@@ -89,9 +89,10 @@ class LRFDocument(LRFMetaFile):
         bookinfo += u'<FreeText reading="">%s</FreeText>\n</BookInfo>\n<DocInfo>\n'%(self.metadata.free_text,)
         th = self.doc_info.thumbnail
         if th:
-            prefix = sanitize_file_name(self.metadata.title)
+            prefix = sanitize_file_name(self.metadata.title, as_unicode=True)
             bookinfo += u'<CThumbnail file="%s" />\n'%(prefix+'_thumbnail.'+self.doc_info.thumbnail_extension,)
-            open(prefix+'_thumbnail.'+self.doc_info.thumbnail_extension, 'wb').write(th)
+            if write_files:
+                open(prefix+'_thumbnail.'+self.doc_info.thumbnail_extension, 'wb').write(th)
         bookinfo += u'<Language reading="">%s</Language>\n'%(self.doc_info.language,)
         bookinfo += u'<Creator reading="">%s</Creator>\n'%(self.doc_info.creator,)
         bookinfo += u'<Producer reading="">%s</Producer>\n'%(self.doc_info.producer,)
@@ -127,12 +128,16 @@ class LRFDocument(LRFMetaFile):
                 objects += unicode(obj)
         styles += '</Style>\n'
         objects += '</Objects>\n'
-        self.write_files()
+        if write_files:
+            self.write_files()
         return '<BBeBXylog version="1.0">\n' + bookinfo + pages + styles + objects + '</BBeBXylog>'
         
 def option_parser():
     parser = OptionParser(usage=_('%prog book.lrf\nConvert an LRF file into an LRS (XML UTF-8 encoded) file'))
     parser.add_option('--output', '-o', default=None, help=_('Output LRS file'), dest='out')
+    parser.add_option('--dont-output-resources', default=True, action='store_false', 
+                      help=_('Do not save embedded image and font files to disk'), 
+                      dest='output_resources')
     parser.add_option('--verbose', default=False, action='store_true', dest='verbose')
     return parser
     
@@ -154,7 +159,7 @@ def main(args=sys.argv, logger=None):
     d = LRFDocument(open(args[1], 'rb'))
     d.parse()
     logger.info(_('Creating XML...'))
-    o.write(d.to_xml())
+    o.write(d.to_xml(write_files=opts.output_resources))
     logger.info(_('LRS written to ')+opts.out)
     return 0
 
diff --git a/src/calibre/ebooks/lrf/meta.py b/src/calibre/ebooks/lrf/meta.py
index 6b5e296d14..331e101ddd 100644
--- a/src/calibre/ebooks/lrf/meta.py
+++ b/src/calibre/ebooks/lrf/meta.py
@@ -603,12 +603,18 @@ Show/edit the metadata in an LRF file.\n\n'''),
     parser.add_option("--get-thumbnail", action="store_true", \
                     dest="get_thumbnail", default=False, \
                     help=_("Extract thumbnail from LRF file"))
+    parser.add_option('--publisher', default=None, help=_('Set the publisher'))
+    parser.add_option('--classification', default=None, help=_('Set the book classification'))
+    parser.add_option('--creator', default=None, help=_('Set the book creator'))
+    parser.add_option('--producer', default=None, help=_('Set the book producer'))
     parser.add_option('--get-cover', action='store_true', default=False, 
                       help=_('Extract cover from LRF file. Note that the LRF format has no defined cover, so we use some heuristics to guess the cover.'))
     parser.add_option('--bookid', action='store', type='string', default=None,
                       dest='book_id', help=_('Set book ID'))
-    parser.add_option("-p", "--page", action="store", type="string", \
-                    dest="page", help=_("Don't know what this is for"))
+    # The SumPage element specifies the number of "View"s (visible pages for the BookSetting element conditions) of the content.
+    # Basically, the total pages per the page size, font size, etc. when the LRF is first created. Since this will change as the book is reflowed, it is probably not worth using.
+    #parser.add_option("-p", "--page", action="store", type="string", \
+    #                dest="page", help=_("Don't know what this is for"))
     
     return parser
 
@@ -624,6 +630,8 @@ def set_metadata(stream, mi):
         lrf.free_text = mi.comments
     if mi.author_sort:
         lrf.author_reading = mi.author_sort
+    if mi.publisher:
+        lrf.publisher = mi.publisher
         
 
 def main(args=sys.argv):
@@ -644,10 +652,16 @@ def main(args=sys.argv):
         lrf.author_reading = options.author_reading
     if options.author:
         lrf.author    = options.author
+    if options.publisher:
+        lrf.publisher = options.publisher
+    if options.classification:
+        lrf.classification = options.classification
     if options.category: 
         lrf.category = options.category
-    if options.page: 
-        lrf.page = options.page
+    if options.creator:
+        lrf.creator = options.creator
+    if options.producer:
+        lrf.producer = options.producer
     if options.thumbnail:
         path = os.path.expanduser(os.path.expandvars(options.thumbnail))
         f = open(path, "rb")
diff --git a/src/calibre/ebooks/lrf/pylrs/pylrs.py b/src/calibre/ebooks/lrf/pylrs/pylrs.py
index 6ee440ce66..60f8d21336 100644
--- a/src/calibre/ebooks/lrf/pylrs/pylrs.py
+++ b/src/calibre/ebooks/lrf/pylrs/pylrs.py
@@ -2338,6 +2338,9 @@ class Canvas(LrsObject, LrsContainer, LrsAttributes):
         container.addLrfObject(c.objId)
         lrfWriter.append(c)
         
+    def has_text(self):
+        return bool(self.contents)
+        
     
 
 class PutObj(LrsContainer):
diff --git a/src/calibre/ebooks/lrf/web/__init__.py b/src/calibre/ebooks/lrf/web/__init__.py
index 30609f014e..c25b6259a8 100644
--- a/src/calibre/ebooks/lrf/web/__init__.py
+++ b/src/calibre/ebooks/lrf/web/__init__.py
@@ -1,37 +1,6 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from calibre.ebooks.lrf.web.profiles.nytimes       import NYTimes
-from calibre.ebooks.lrf.web.profiles.bbc           import BBC
-from calibre.ebooks.lrf.web.profiles.newsweek      import Newsweek
-from calibre.ebooks.lrf.web.profiles.economist     import Economist
-from calibre.ebooks.lrf.web.profiles.newyorkreview import NewYorkReviewOfBooks
-from calibre.ebooks.lrf.web.profiles.spiegelde     import SpiegelOnline
-from calibre.ebooks.lrf.web.profiles.zeitde        import ZeitNachrichten
-from calibre.ebooks.lrf.web.profiles.faznet        import FazNet
-from calibre.ebooks.lrf.web.profiles.wsj           import WallStreetJournal
-from calibre.ebooks.lrf.web.profiles.barrons       import Barrons
-from calibre.ebooks.lrf.web.profiles.portfolio     import Portfolio
-from calibre.ebooks.lrf.web.profiles.cnn           import CNN
-from calibre.ebooks.lrf.web.profiles.chr_mon       import ChristianScienceMonitor
-from calibre.ebooks.lrf.web.profiles.jpost         import JerusalemPost
-from calibre.ebooks.lrf.web.profiles.reuters       import Reuters
-from calibre.ebooks.lrf.web.profiles.atlantic      import Atlantic 
-from calibre.ebooks.lrf.web.profiles.ap            import AssociatedPress 
-from calibre.ebooks.lrf.web.profiles.newyorker     import NewYorker 
-from calibre.ebooks.lrf.web.profiles.jutarnji      import Jutarnji
-from calibre.ebooks.lrf.web.profiles.usatoday      import USAToday
-from calibre.ebooks.lrf.web.profiles.upi           import UnitedPressInternational 
-from calibre.ebooks.lrf.web.profiles.wash_post     import WashingtonPost 
-from calibre.ebooks.lrf.web.profiles.nasa          import NASA 
 
-
-builtin_profiles   = [Atlantic, AssociatedPress, Barrons, BBC, 
-                      ChristianScienceMonitor, CNN, Economist, FazNet, 
-                      JerusalemPost, Jutarnji, NASA, Newsweek, NewYorker, 
-                      NewYorkReviewOfBooks, NYTimes, UnitedPressInternational, USAToday,  
-                      Portfolio, Reuters, SpiegelOnline, WallStreetJournal, 
-                      WashingtonPost, ZeitNachrichten,   
-                     ]
-
-available_profiles = [i.__module__.rpartition('.')[2] for i in builtin_profiles]
\ No newline at end of file
+builtin_profiles   = []
+available_profiles = [i.__module__.rpartition('.')[2] for i in builtin_profiles]
diff --git a/src/calibre/ebooks/lrf/web/profiles/nasa.py b/src/calibre/ebooks/lrf/web/profiles/nasa.py
index 9fe9eff933..c584f6c545 100644
--- a/src/calibre/ebooks/lrf/web/profiles/nasa.py
+++ b/src/calibre/ebooks/lrf/web/profiles/nasa.py
@@ -61,7 +61,7 @@ class NASA(DefaultProfile):
 		(re.compile(r'<!-- Top Header starts -->.*?<!---->', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
 		
 		## This removes the "download image" of various sizes from the Image of the day.
-		(re.compile(r'<div id="download_image_box_print">.*?<div id="caption_region_print">', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
+		(re.compile(r'(?is)<div id="download_image_box_print">.*?<div id="caption_region_print">'), lambda match : '<New Stuff>'),
 
 
 		]
diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py
index 077bcf9440..a7114c48d8 100644
--- a/src/calibre/ebooks/metadata/epub.py
+++ b/src/calibre/ebooks/metadata/epub.py
@@ -103,6 +103,8 @@ class OCFDirReader(OCFReader):
         return open(os.path.join(self.root, path), *args, **kwargs)
 
 class CoverRenderer(QObject):
+    WIDTH  = 1280
+    HEIGHT = 1024
     
     def __init__(self, url, size, loop):
         QObject.__init__(self)
@@ -111,6 +113,9 @@ class CoverRenderer(QObject):
         pal = self.page.palette()
         pal.setBrush(QPalette.Background, Qt.white)
         self.page.setPalette(pal)
+        self.page.setViewportSize(QSize(600, 800))
+        self.page.mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff)
+        self.page.mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
         QObject.connect(self.page, SIGNAL('loadFinished(bool)'), self.render_html)
         self.image_data = None
         self.rendered = False
@@ -122,7 +127,7 @@ class CoverRenderer(QObject):
             if not ok:
                 return
             size = self.page.mainFrame().contentsSize()
-            width, height = fit_image(size.width(), size.height(), 1280, 1024)[1:]
+            width, height = fit_image(size.width(), size.height(), self.WIDTH, self.HEIGHT)[1:]
             self.page.setViewportSize(QSize(width, height))
             image = QImage(self.page.viewportSize(), QImage.Format_ARGB32)
             image.setDotsPerMeterX(96*(100/2.54))
diff --git a/src/calibre/ebooks/metadata/html.py b/src/calibre/ebooks/metadata/html.py
index b267a9e647..9ef578c858 100644
--- a/src/calibre/ebooks/metadata/html.py
+++ b/src/calibre/ebooks/metadata/html.py
@@ -10,13 +10,14 @@ Try to read metadata from an HTML file.
 import re
 
 from calibre.ebooks.metadata import MetaInformation
+from calibre.ebooks.chardet import xml_to_unicode
 
 def get_metadata(stream):
-    src = stream.read()
+    src = xml_to_unicode(stream.read())[0]
     
     # Title
     title = None
-    pat = re.compile(r'<!--.*?TITLE=(?P<q>[\'"])(.+)(?P=q).*?-->', re.DOTALL)
+    pat = re.compile(r'<!--.*?TITLE=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
     match = pat.search(src)
     if match:
         title = match.group(2)
@@ -28,7 +29,7 @@ def get_metadata(stream):
         
     # Author
     author = None
-    pat = re.compile(r'<!--.*?AUTHOR=(?P<q>[\'"])(.+)(?P=q).*?-->', re.DOTALL)
+    pat = re.compile(r'<!--.*?AUTHOR=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
     match = pat.search(src)
     if match:
         author = match.group(2).replace(',', ';')
@@ -36,7 +37,7 @@ def get_metadata(stream):
     mi = MetaInformation(title, [author] if author else None)
     
     # Publisher
-    pat = re.compile(r'<!--.*?PUBLISHER=(?P<q>[\'"])(.+)(?P=q).*?-->', re.DOTALL)
+    pat = re.compile(r'<!--.*?PUBLISHER=(?P<q>[\'"])(.+?)(?P=q).*?-->', re.DOTALL)
     match = pat.search(src)
     if match:
         mi.publisher = match.group(2)
diff --git a/src/calibre/ebooks/metadata/lrx.py b/src/calibre/ebooks/metadata/lrx.py
new file mode 100644
index 0000000000..2106a45450
--- /dev/null
+++ b/src/calibre/ebooks/metadata/lrx.py
@@ -0,0 +1,89 @@
+#!/usr/bin/env  python
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+'''
+Read metadata from LRX files
+'''
+
+import sys, struct
+from zlib import decompress
+from lxml import etree
+
+from calibre.ebooks.metadata import MetaInformation, string_to_authors
+
+def _read(f, at, amount):
+    f.seek(at)
+    return f.read(amount)
+
+def word_be(buf):
+    return struct.unpack('>L', buf)[0]
+
+def word_le(buf):
+    return struct.unpack('<L', buf)[0]
+
+def short_le(buf):
+    return struct.unpack('<H', buf)[0]
+
+def short_be(buf):
+    return struct.unpack('>H', buf)[0]
+
+
+def get_metadata(f):
+    read = lambda at, amount: _read(f, at, amount)
+    f.seek(0)
+    buf = f.read(12) 
+    if buf[4:] == 'ftypLRX2':
+        offset = 0
+        while True:
+            offset += word_be(buf[:4])
+            try:
+                buf = read(offset, 8)
+            except:
+                raise ValueError('Not a valid LRX file')
+            if buf[4:] == 'bbeb':
+                break
+        offset += 8
+        buf = read(offset, 16)
+        if buf[:8].decode('utf-16-le') != 'LRF\x00':
+            raise ValueError('Not a valid LRX file')
+        lrf_version = word_le(buf[8:12])
+        offset += 0x4c
+        compressed_size = short_le(read(offset, 2))
+        offset += 2
+        if lrf_version >= 800:
+            offset += 6
+        compressed_size -= 4
+        uncompressed_size = word_le(read(offset, 4))
+        info = decompress(f.read(compressed_size))
+        if len(info) != uncompressed_size:
+            raise ValueError('LRX file has malformed metadata section')
+        root = etree.fromstring(info)
+        bi = root.find('BookInfo')
+        title = bi.find('Title')
+        title_sort = title.get('reading', None)
+        title = title.text
+        author = bi.find('Author')
+        author_sort = author.get('reading', None)
+        mi = MetaInformation(title, string_to_authors(author.text))
+        mi.title_sort, mi.author_sort = title_sort, author_sort
+        author = author.text
+        publisher = bi.find('Publisher')
+        mi.publisher = getattr(publisher, 'text', None)
+        mi.tags = [x.text for x in  bi.findall('Category')]
+        mi.language = root.find('DocInfo').find('Language').text
+        return mi
+        
+    elif buf[4:8] == 'LRX':
+        raise ValueError('Librie LRX format not supported')
+    else:
+        raise ValueError('Not a LRX file')
+    
+
+def main(args=sys.argv):
+    print get_metadata(open(args[1], 'rb'))
+    return 0
+
+if __name__ == '__main__':
+    sys.exit(main())
\ No newline at end of file
diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py
index aff09281da..f2c31a538d 100644
--- a/src/calibre/ebooks/metadata/meta.py
+++ b/src/calibre/ebooks/metadata/meta.py
@@ -5,36 +5,17 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, re, collections
 
 from calibre.utils.config import prefs
-from calibre.ebooks.metadata.rtf  import get_metadata as rtf_metadata
-from calibre.ebooks.metadata.fb2  import get_metadata as fb2_metadata
-from calibre.ebooks.lrf.meta      import get_metadata as lrf_metadata
-from calibre.ebooks.metadata.pdf  import get_metadata as pdf_metadata
-from calibre.ebooks.metadata.lit  import get_metadata as lit_metadata
-from calibre.ebooks.metadata.imp  import get_metadata as imp_metadata
-from calibre.ebooks.metadata.rb   import get_metadata as rb_metadata
-from calibre.ebooks.metadata.epub import get_metadata as epub_metadata
-from calibre.ebooks.metadata.html import get_metadata as html_metadata
-from calibre.ebooks.mobi.reader   import get_metadata as mobi_metadata
-from calibre.ebooks.metadata.odt  import get_metadata as odt_metadata
+ 
 from calibre.ebooks.metadata.opf2 import OPF
-from calibre.ebooks.metadata.rtf  import set_metadata as set_rtf_metadata
-from calibre.ebooks.lrf.meta      import set_metadata as set_lrf_metadata
-from calibre.ebooks.metadata.epub import set_metadata as set_epub_metadata
-from calibre.ebooks.metadata.pdf  import set_metadata as set_pdf_metadata
-try:
-    from calibre.libunrar import extract_member as rar_extract_first
-except OSError:
-    rar_extract_first = None
-    
-from calibre.libunzip import extract_member as zip_extract_first
 
+from calibre.customize.ui import get_file_type_metadata, set_file_type_metadata
 from calibre.ebooks.metadata import MetaInformation
-from calibre.ptempfile import TemporaryDirectory
 
 _METADATA_PRIORITIES = [
                        'html', 'htm', 'xhtml', 'xhtm',
                        'rtf', 'fb2', 'pdf', 'prc', 'odt',
-                       'epub', 'lit', 'lrf', 'mobi', 'rb', 'imp'
+                       'epub', 'lit', 'lrx', 'lrf', 'mobi',
+                       'rb', 'imp'
                       ]
 
 # The priorities for loading metadata from different file types
@@ -87,11 +68,7 @@ def get_metadata(stream, stream_type='lrf', use_libprs_metadata=False):
     
     mi = MetaInformation(None, None)
     if prefs['read_file_metadata']:
-        try:
-            func = eval(stream_type + '_metadata')
-            mi = func(stream)
-        except NameError:
-            pass
+        mi = get_file_type_metadata(stream, stream_type)
         
     name = os.path.basename(getattr(stream, 'name', ''))
     base = metadata_from_filename(name)
@@ -103,37 +80,14 @@ def get_metadata(stream, stream_type='lrf', use_libprs_metadata=False):
     if opf is not None:
         base.smart_update(opf)
         
-    if stream_type in ('cbr', 'cbz'):
-        try:
-            cdata = get_comic_cover(stream, stream_type)
-            if cdata is not None:
-                base.cover_data = cdata
-        except:
-            import traceback
-            traceback.print_exc()
-            pass
-        
     return base
 
-def get_comic_cover(stream, type):
-    extract_first = zip_extract_first if type.lower() == 'cbz' else rar_extract_first
-    ret = extract_first(stream)
-    if ret is not None:
-        path, data = ret
-        ext = os.path.splitext(path)[1][1:]
-        return (ext.lower(), data)
-        
 def set_metadata(stream, mi, stream_type='lrf'):
-    if stream_type: stream_type = stream_type.lower()
-    if stream_type == 'lrf':
-        set_lrf_metadata(stream, mi)
-    elif stream_type == 'epub':
-        set_epub_metadata(stream, mi)
-    elif stream_type == 'rtf':
-        set_rtf_metadata(stream, mi)
-    #elif stream_type == 'pdf':
-    #    set_pdf_metadata(stream, mi)
-
+    if stream_type:
+        stream_type = stream_type.lower()
+    set_file_type_metadata(stream, mi, stream_type)
+    
+    
 def metadata_from_filename(name, pat=None):
     name = os.path.splitext(name)[0]
     mi = MetaInformation(None, None)
diff --git a/src/calibre/ebooks/metadata/opf.py b/src/calibre/ebooks/metadata/opf.py
index 21e0730c8c..ce137ffa15 100644
--- a/src/calibre/ebooks/metadata/opf.py
+++ b/src/calibre/ebooks/metadata/opf.py
@@ -70,7 +70,7 @@ class Manifest(ResourceCollection):
     @staticmethod
     def from_opf_manifest_element(manifest, dir):
         m = Manifest()
-        for item in manifest.findAll('item'):
+        for item in manifest.findAll(re.compile('item')):
             try:
                 m.append(ManifestItem.from_opf_manifest_item(item, dir))
                 id = item.get('id', '')
@@ -130,7 +130,7 @@ class Spine(ResourceCollection):
     @staticmethod
     def from_opf_spine_element(spine, manifest):
         s = Spine(manifest)
-        for itemref in spine.findAll('itemref'):
+        for itemref in spine.findAll(re.compile('itemref')):
             if itemref.has_key('idref'):
                 r = Spine.Item(s.manifest.id_for_path,
                                s.manifest.path_for_id(itemref['idref']), is_path=True)
@@ -216,7 +216,7 @@ class standard_field(object):
     def __get__(self, obj, typ=None):
         return getattr(obj, 'get_'+self.name)()
     
-        
+
 class OPF(MetaInformation):
     
     MIMETYPE = 'application/oebps-package+xml'
@@ -242,14 +242,27 @@ class OPF(MetaInformation):
     def __init__(self):
         raise NotImplementedError('Abstract base class')
     
+    @apply
+    def package():
+        def fget(self):
+            return self.soup.find(re.compile('package'))
+        return property(fget=fget)
+    
+    @apply
+    def metadata():
+        def fget(self):
+            return self.package.find(re.compile('metadata'))
+        return property(fget=fget)
+    
+    
     def get_title(self):
-        title = self.soup.package.metadata.find('dc:title')
+        title = self.metadata.find('dc:title')
         if title and title.string:
             return self.ENTITY_PATTERN.sub(entity_to_unicode, title.string).strip()
         return self.default_title.strip()
     
     def get_authors(self):
-        creators = self.soup.package.metadata.findAll('dc:creator')
+        creators = self.metadata.findAll('dc:creator')
         for elem in creators:
             role = elem.get('role')
             if not role:
@@ -266,7 +279,7 @@ class OPF(MetaInformation):
         return []
     
     def get_author_sort(self):
-        creators = self.soup.package.metadata.findAll('dc:creator')
+        creators = self.metadata.findAll('dc:creator')
         for elem in creators:
             role = elem.get('role')
             if not role:
@@ -277,7 +290,7 @@ class OPF(MetaInformation):
         return None
     
     def get_title_sort(self):
-        title = self.soup.package.find('dc:title')
+        title = self.package.find('dc:title')
         if title:
             if title.has_key('file-as'):
                 return title['file-as'].strip()
@@ -290,7 +303,7 @@ class OPF(MetaInformation):
         return None
     
     def get_uid(self):
-        package = self.soup.find('package')
+        package = self.package
         if package.has_key('unique-identifier'):
             return package['unique-identifier']
         
@@ -307,7 +320,7 @@ class OPF(MetaInformation):
         return None
     
     def get_isbn(self):
-        for item in self.soup.package.metadata.findAll('dc:identifier'):
+        for item in self.metadata.findAll('dc:identifier'):
             scheme = item.get('scheme')
             if not scheme:
                 scheme = item.get('opf:scheme')
@@ -316,13 +329,13 @@ class OPF(MetaInformation):
         return None
     
     def get_language(self):
-        item = self.soup.package.metadata.find('dc:language')
+        item = self.metadata.find('dc:language')
         if not item:
             return _('Unknown')
         return ''.join(item.findAll(text=True)).strip()
     
     def get_application_id(self):
-        for item in self.soup.package.metadata.findAll('dc:identifier'):
+        for item in self.metadata.findAll('dc:identifier'):
             scheme = item.get('scheme', None)
             if scheme is None:
                 scheme = item.get('opf:scheme', None)
@@ -342,7 +355,7 @@ class OPF(MetaInformation):
     
     def possible_cover_prefixes(self):
         isbn, ans = [], []
-        for item in self.soup.package.metadata.findAll('dc:identifier'):
+        for item in self.metadata.findAll('dc:identifier'):
             scheme = item.get('scheme')
             if not scheme:
                 scheme = item.get('opf:scheme')
@@ -352,13 +365,13 @@ class OPF(MetaInformation):
         return ans
     
     def get_series(self):
-        s = self.soup.package.metadata.find('series')
+        s = self.metadata.find('series')
         if s is not None:
             return str(s.string).strip()
         return None
     
     def get_series_index(self):
-        s = self.soup.package.metadata.find('series-index')
+        s = self.metadata.find('series-index')
         if s and s.string:
             try:
                 return int(str(s.string).strip())
@@ -367,7 +380,7 @@ class OPF(MetaInformation):
         return None
     
     def get_rating(self):
-        s = self.soup.package.metadata.find('rating')
+        s = self.metadata.find('rating')
         if s and s.string:
             try:
                 return int(str(s.string).strip())
@@ -400,17 +413,17 @@ class OPFReader(OPF):
         if manage:
             stream.close()
         self.manifest = Manifest()
-        m = self.soup.find('manifest')
+        m = self.soup.find(re.compile('manifest'))
         if m is not None:
             self.manifest = Manifest.from_opf_manifest_element(m, dir)
         self.spine = None
-        spine = self.soup.find('spine')
+        spine = self.soup.find(re.compile('spine'))
         if spine is not None:
             self.spine = Spine.from_opf_spine_element(spine, self.manifest)
         
         self.toc = TOC(base_path=dir)
         self.toc.read_from_opf(self)
-        guide = self.soup.find('guide')
+        guide = self.soup.find(re.compile('guide'))
         if guide is not None:
             self.guide = Guide.from_opf_guide(guide, dir)
         self.base_dir = dir 
diff --git a/src/calibre/ebooks/metadata/opf2.py b/src/calibre/ebooks/metadata/opf2.py
index be99bb8332..08ed9aacd1 100644
--- a/src/calibre/ebooks/metadata/opf2.py
+++ b/src/calibre/ebooks/metadata/opf2.py
@@ -30,7 +30,6 @@ class Resource(object):
     :member:`path`
     :member:`mime_type`
     :method:`href`
-    
     '''
     
     def __init__(self, href_or_path, basedir=os.getcwd(), is_path=True):
@@ -419,7 +418,8 @@ class OPF(object):
     tags_path       = XPath('descendant::*[re:match(name(), "subject", "i")]')
     isbn_path       = XPath('descendant::*[re:match(name(), "identifier", "i") and '+
                             '(re:match(@scheme, "isbn", "i") or re:match(@opf:scheme, "isbn", "i"))]')
-    application_id_path= XPath('descendant::*[re:match(name(), "identifier", "i") and '+
+    identifier_path = XPath('descendant::*[re:match(name(), "identifier", "i")]')
+    application_id_path = XPath('descendant::*[re:match(name(), "identifier", "i") and '+
                             '(re:match(@opf:scheme, "calibre|libprs500", "i") or re:match(@scheme, "calibre|libprs500", "i"))]')
     manifest_path   = XPath('descendant::*[re:match(name(), "manifest", "i")]/*[re:match(name(), "item", "i")]')
     manifest_ppath  = XPath('descendant::*[re:match(name(), "manifest", "i")]') 
@@ -720,6 +720,27 @@ class OPF(object):
         return property(fget=fget, fset=fset)
     
     
+    def guess_cover(self):
+        '''
+        Try to guess a cover. Needed for some old/badly formed OPF files.
+        '''
+        if self.base_dir and os.path.exists(self.base_dir):
+            for item in self.identifier_path(self.metadata):
+                scheme = None
+                for key in item.attrib.keys():
+                    if key.endswith('scheme'):
+                        scheme = item.get(key)
+                        break
+                if scheme is None:
+                    continue
+                if item.text:
+                    prefix = item.text.replace('-', '')
+                    for suffix in ['.jpg', '.jpeg', '.gif', '.png', '.bmp']:
+                        cpath = os.access(os.path.join(self.base_dir, prefix+suffix), os.R_OK)
+                        if os.access(os.path.join(self.base_dir, prefix+suffix), os.R_OK):
+                            return cpath
+            
+    
     @apply
     def cover():
         
@@ -729,6 +750,10 @@ class OPF(object):
                     for item in self.guide:
                         if item.type.lower() == t:
                             return item.path
+            try:
+                return self.guess_cover()
+            except:
+                pass
                         
         def fset(self, path):
             if self.guide is not None:
diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index a3aa5b7ae7..2163697d16 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -22,6 +22,7 @@ from calibre.ebooks.mobi.langcodes import main_language, sub_language
 from calibre.ebooks.metadata import MetaInformation
 from calibre.ebooks.metadata.opf import OPFCreator
 from calibre.ebooks.metadata.toc import TOC
+from calibre import sanitize_file_name
 
 class EXTHHeader(object):
     
@@ -101,7 +102,7 @@ class BookHeader(object):
             if ident == 'TEXTREAD' or self.length < 0xE4 or 0xE8 < self.length:
                 self.extra_flags = 0
             else:
-                self.extra_flags, = struct.unpack('>L', raw[0xF0:0xF4])
+                self.extra_flags, = struct.unpack('>H', raw[0xF2:0xF4])
             
             if self.compression_type == 'DH':
                 self.huff_offset, self.huff_number = struct.unpack('>LL', raw[0x70:0x78]) 
@@ -200,7 +201,8 @@ class MobiReader(object):
         guide = soup.find('guide')
         for elem in soup.findAll(['metadata', 'guide']):
             elem.extract()
-        htmlfile = os.path.join(output_dir, self.name+'.html')
+        htmlfile = os.path.join(output_dir, 
+                                sanitize_file_name(self.name)+'.html')
         try:
             for ref in guide.findAll('reference', href=True):
                 ref['href'] = os.path.basename(htmlfile)+ref['href']
@@ -232,6 +234,15 @@ class MobiReader(object):
     def cleanup_soup(self, soup):
         if self.verbose:
             print 'Replacing height, width and align attributes'
+        size_map = {
+                    'xx-small' : '0.5',
+                    'x-small'  : '1',
+                    'small'    : '2',
+                    'medium'   : '3',
+                    'large'    : '4',
+                    'x-large'  : '5',
+                    'xx-large' : '6',
+                    }
         for tag in soup.recursiveChildGenerator():
             if not isinstance(tag, Tag): continue
             styles = []
@@ -246,6 +257,8 @@ class MobiReader(object):
                 pass
             try:
                 styles.append('text-indent: %s' % tag['width'])
+                if tag['width'].startswith('-'):
+                    styles.append('margin-left: %s'%(tag['width'][1:]))
                 del tag['width']
             except KeyError:
                 pass
@@ -256,6 +269,15 @@ class MobiReader(object):
                 pass
             if styles:
                 tag['style'] = '; '.join(styles)
+                
+            if tag.name.lower() == 'font':
+                sz = tag.get('size', '')
+                try:
+                    float(sz)
+                except ValueError:
+                    sz = sz.lower()
+                    if sz in size_map.keys():
+                        tag['size'] = size_map[sz]
     
     def create_opf(self, htmlfile, guide=None):
         mi = self.book_header.exth.mi
@@ -289,7 +311,8 @@ class MobiReader(object):
                     except:
                         text = ''
                     text = ent_pat.sub(entity_to_unicode, text)
-                    tocobj.add_item(toc.partition('#')[0], a['href'][1:], text)
+                    if a['href'].startswith('#'):
+                        tocobj.add_item(toc.partition('#')[0], a['href'][1:], text)
             if tocobj is not None:
                 opf.set_toc(tocobj)
         
diff --git a/src/calibre/ebooks/pdf/__init__.py b/src/calibre/ebooks/pdf/__init__.py
new file mode 100644
index 0000000000..3b55c26564
--- /dev/null
+++ b/src/calibre/ebooks/pdf/__init__.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env  python
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+'''
+Used for pdf output for comic2pdf
+'''
+
diff --git a/src/calibre/ebooks/pdf/from_comic.py b/src/calibre/ebooks/pdf/from_comic.py
new file mode 100644
index 0000000000..9e1bd76188
--- /dev/null
+++ b/src/calibre/ebooks/pdf/from_comic.py
@@ -0,0 +1,21 @@
+from __future__ import with_statement
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+'Convert a comic in CBR/CBZ format to pdf'
+
+import sys
+from functools import partial
+from calibre.ebooks.lrf.comic.convert_from import do_convert, option_parser, config, main as _main
+
+convert = partial(do_convert, output_format='pdf')
+main    = partial(_main, output_format='pdf')
+
+if __name__ == '__main__':
+    sys.exit(main())
+
+if False:
+    option_parser
+    config
+    
diff --git a/src/calibre/ebooks/rtf2xml/ParseRtf.py b/src/calibre/ebooks/rtf2xml/ParseRtf.py
index 2dacc0c49d..5b008df615 100755
--- a/src/calibre/ebooks/rtf2xml/ParseRtf.py
+++ b/src/calibre/ebooks/rtf2xml/ParseRtf.py
@@ -233,7 +233,7 @@ class ParseRtf:
                 bug_handler = RtfInvalidCodeException,
                     )
             check_encoding_obj.check_encoding(self.__file)
-            sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file)
+            sys.stderr.write('File "%s" does not appear to be RTF.\n' % self.__file if isinstance(self.__file, str) else self.__file.encode('utf-8'))
             raise InvalidRtfException, msg
         delete_info_obj = delete_info.DeleteInfo(
             in_file = self.__temp_file,
diff --git a/src/calibre/ebooks/rtf2xml/check_encoding.py b/src/calibre/ebooks/rtf2xml/check_encoding.py
index d2bd4f8ce1..f6810e4909 100755
--- a/src/calibre/ebooks/rtf2xml/check_encoding.py
+++ b/src/calibre/ebooks/rtf2xml/check_encoding.py
@@ -23,7 +23,10 @@ class CheckEncoding:
             try:
                 line.decode(encoding)
             except UnicodeError:
-                self.__get_position_error(line, encoding, line_num)
+                if len(line) < 1000:
+                    self.__get_position_error(line, encoding, line_num)
+                else:
+                    sys.stderr.write('line: %d has bad encoding\n'%line_num)
 if __name__ == '__main__':
     check_encoding_obj = CheckEncoding()
     check_encoding_obj.check_encoding(sys.argv[1])
diff --git a/src/calibre/ebooks/sgmllib.py b/src/calibre/ebooks/sgmllib.py
index 2a83225d43..4a82a1a9e3 100644
--- a/src/calibre/ebooks/sgmllib.py
+++ b/src/calibre/ebooks/sgmllib.py
@@ -351,7 +351,7 @@ class SGMLParser(markupbase.ParserBase):
             if tag not in self.stack:
                 try:
                     method = getattr(self, 'end_' + tag)
-                except AttributeError:
+                except (AttributeError, ValueError):
                     self.unknown_endtag(tag)
                 else:
                     self.report_unbalanced(tag)
diff --git a/src/calibre/gui2/__init__.py b/src/calibre/gui2/__init__.py
index 3799e1d1de..ccc14b8d1f 100644
--- a/src/calibre/gui2/__init__.py
+++ b/src/calibre/gui2/__init__.py
@@ -14,7 +14,6 @@ from calibre import __author__, islinux, iswindows, isosx
 from calibre.startup import get_lang
 from calibre.utils.config import Config, ConfigProxy, dynamic
 import calibre.resources as resources
-from calibre.ebooks.html import gui_main as html2oeb
 
 NONE = QVariant() #: Null value to return from the data function of item models
 
@@ -55,8 +54,12 @@ def _config():
     c.add_opt('autolaunch_server', default=False, help=_('Automatically launch content server on application startup'))
     c.add_opt('oldest_news', default=60, help=_('Oldest news kept in database'))
     c.add_opt('systray_icon', default=True, help=_('Show system tray icon'))
-    c.add_opt('upload_news_to_device', default=True, help=_('Upload downloaded news to device'))
-    c.add_opt('delete_news_from_library_on_upload', default=False, help=_('Delete books from library after uploading to device'))
+    c.add_opt('upload_news_to_device', default=True, 
+              help=_('Upload downloaded news to device'))
+    c.add_opt('delete_news_from_library_on_upload', default=False, 
+              help=_('Delete books from library after uploading to device'))
+    c.add_opt('separate_cover_flow', default=False, 
+              help=_('Show the cover flow in a separate window instead of in the main calibre window'))
     return ConfigProxy(c)
     
 config = _config()
@@ -389,14 +392,6 @@ def pixmap_to_data(pixmap, format='JPEG'):
     pixmap.save(buf, format)
     return str(ba.data())
 
-html_pat = re.compile(r'\.x{0,1}htm(l{0,1})\s*$', re.IGNORECASE)
-def import_format(path):
-    if html_pat.search(path) is not None:
-        try:
-            return html2oeb(path), 'zip'
-        except:
-            traceback.print_exc()
-    return None, None
 
 try:
     from calibre.utils.single_qt_application import SingleApplication
diff --git a/src/calibre/gui2/cover_flow.py b/src/calibre/gui2/cover_flow.py
index 196e723be7..220e368a04 100644
--- a/src/calibre/gui2/cover_flow.py
+++ b/src/calibre/gui2/cover_flow.py
@@ -69,11 +69,11 @@ if pictureflow is not None:
             
     class CoverFlow(pictureflow.PictureFlow):
         
-        def __init__(self, height=300, parent=None):
+        def __init__(self, height=300, parent=None, text_height=25):
             pictureflow.PictureFlow.__init__(self, parent, 
                                 config['cover_flow_queue_length']+1)
             self.setSlideSize(QSize(int(2/3. * height), height))
-            self.setMinimumSize(QSize(int(2.35*0.67*height), (5/3.)*height+25))
+            self.setMinimumSize(QSize(int(2.35*0.67*height), (5/3.)*height+text_height))
             self.setFocusPolicy(Qt.WheelFocus)
             self.setSizePolicy(QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum))
             
diff --git a/src/calibre/gui2/dialogs/choose_format.py b/src/calibre/gui2/dialogs/choose_format.py
index b1918b56f4..809b636690 100644
--- a/src/calibre/gui2/dialogs/choose_format.py
+++ b/src/calibre/gui2/dialogs/choose_format.py
@@ -1,7 +1,7 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 
-from PyQt4.QtGui import QDialog, QListWidgetItem
+from PyQt4.Qt import QDialog, QListWidgetItem, SIGNAL
 
 from calibre.gui2 import file_icon_provider
 from calibre.gui2.dialogs.choose_format_ui import Ui_ChooseFormatDialog
@@ -12,6 +12,7 @@ class ChooseFormatDialog(QDialog, Ui_ChooseFormatDialog):
         QDialog.__init__(self, window)
         Ui_ChooseFormatDialog.__init__(self)
         self.setupUi(self)
+        self.connect(self.formats, SIGNAL('activated(QModelIndex)'), lambda i: self.accept())
         
         self.msg.setText(msg)
         for format in formats:
diff --git a/src/calibre/gui2/dialogs/comicconf.py b/src/calibre/gui2/dialogs/comicconf.py
index 50f4254be2..a53865627f 100644
--- a/src/calibre/gui2/dialogs/comicconf.py
+++ b/src/calibre/gui2/dialogs/comicconf.py
@@ -7,7 +7,7 @@ __docformat__ = 'restructuredtext en'
 from PyQt4.QtGui import QDialog
 from calibre.gui2.dialogs.comicconf_ui import Ui_Dialog
 from calibre.gui2 import qstring_to_unicode
-from calibre.ebooks.lrf.comic.convert_from import config
+from calibre.ebooks.lrf.comic.convert_from import config, PROFILES
 
 def set_conversion_defaults(window):
     d = ComicConf(window)
@@ -52,6 +52,9 @@ class ComicConf(QDialog, Ui_Dialog):
             self.opt_author.setText(author)
         self.opt_colors.setValue(opts.colors)
         self.opt_profile.addItem(opts.profile)
+        for x in PROFILES.keys():
+            if x != opts.profile:
+                self.opt_profile.addItem(x)
         self.opt_dont_normalize.setChecked(opts.dont_normalize)
         self.opt_keep_aspect_ratio.setChecked(opts.keep_aspect_ratio)
         self.opt_dont_sharpen.setChecked(opts.dont_sharpen)
diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py
index c4e673c8b8..8acbb2a825 100644
--- a/src/calibre/gui2/dialogs/config.py
+++ b/src/calibre/gui2/dialogs/config.py
@@ -1,21 +1,137 @@
 __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
-import os, re, time
+import os, re, time, textwrap
 
-from PyQt4.QtGui import QDialog, QMessageBox, QListWidgetItem, QIcon, \
-                        QDesktopServices, QVBoxLayout, QLabel, QPlainTextEdit
-from PyQt4.QtCore import SIGNAL, QTimer, Qt, QSize, QVariant, QUrl
+from PyQt4.Qt import    QDialog, QMessageBox, QListWidgetItem, QIcon, \
+                        QDesktopServices, QVBoxLayout, QLabel, QPlainTextEdit, \
+                        QStringListModel, QAbstractItemModel, \
+                        SIGNAL, QTimer, Qt, QSize, QVariant, QUrl, \
+                        QModelIndex, QInputDialog
 
-from calibre import islinux
+from calibre.constants import islinux, iswindows
 from calibre.gui2.dialogs.config_ui import Ui_Dialog
 from calibre.gui2 import qstring_to_unicode, choose_dir, error_dialog, config, \
-                         warning_dialog, ALL_COLUMNS
+                         ALL_COLUMNS, NONE, info_dialog, choose_files
 from calibre.utils.config import prefs
 from calibre.gui2.widgets import FilenamePattern
 from calibre.gui2.library import BooksModel
 from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.epub.iterator import is_supported
 from calibre.library import server_config
+from calibre.customize.ui import initialized_plugins, is_disabled, enable_plugin, \
+                                 disable_plugin, customize_plugin, \
+                                 plugin_customization, add_plugin, remove_plugin
+
+class PluginModel(QAbstractItemModel):
+    
+    def __init__(self, *args):
+        QAbstractItemModel.__init__(self, *args)
+        self.icon = QVariant(QIcon(':/images/plugins.svg'))
+        self.populate()
+        
+    def populate(self):
+        self._data = {}
+        for plugin in initialized_plugins():
+            if plugin.type not in self._data:
+                self._data[plugin.type] = [plugin]
+            else:
+                self._data[plugin.type].append(plugin)
+        self.categories = sorted(self._data.keys())
+        
+    def index(self, row, column, parent):
+        if not self.hasIndex(row, column, parent):
+            return QModelIndex()
+        
+        if parent.isValid():
+            return self.createIndex(row, column, parent.row())
+        else:
+            return self.createIndex(row, column, -1)
+        
+    def parent(self, index):
+        if not index.isValid() or index.internalId() == -1:
+            return QModelIndex()
+        return self.createIndex(index.internalId(), 0, -1)
+    
+    def rowCount(self, parent):
+        if not parent.isValid():
+            return len(self.categories)
+        if parent.internalId() == -1:
+            category = self.categories[parent.row()]
+            return len(self._data[category])
+        return 0
+    
+    def columnCount(self, parent):
+        return 1
+    
+    def index_to_plugin(self, index):
+        category = self.categories[index.parent().row()]
+        return self._data[category][index.row()]
+    
+    def plugin_to_index(self, plugin):
+        for i, category in enumerate(self.categories):
+            parent = self.index(i, 0, QModelIndex())
+            for j, p in enumerate(self._data[category]):
+                if plugin == p:
+                    return self.index(j, 0, parent)
+        return QModelIndex()
+    
+    def refresh_plugin(self, plugin, rescan=False):
+        if rescan:
+            self.populate()
+        idx = self.plugin_to_index(plugin)
+        self.emit(SIGNAL('dataChanged(QModelIndex,QModelIndex)'), idx, idx)
+    
+    def flags(self, index):
+        if not index.isValid():
+            return 0
+        if index.internalId() == -1:
+            return Qt.ItemIsEnabled
+        flags = Qt.ItemIsSelectable
+        if not is_disabled(self.data(index, Qt.UserRole)):
+            flags |= Qt.ItemIsEnabled
+        return flags
+            
+    def data(self, index, role):
+        if not index.isValid():
+            return NONE
+        if index.internalId() == -1:
+            if role == Qt.DisplayRole:
+                category = self.categories[index.row()]
+                return QVariant(category + _(' plugins'))
+        else:
+            plugin = self.index_to_plugin(index)
+            if role == Qt.DisplayRole:
+                ver = '.'.join(map(str, plugin.version))
+                desc = '\n'.join(textwrap.wrap(plugin.description, 50))
+                ans='%s (%s) %s %s\n%s'%(plugin.name, ver, _('by'), plugin.author, desc)
+                c = plugin_customization(plugin)
+                if c:
+                    ans += '\nCustomization: '+c
+                return QVariant(ans)
+            if role == Qt.DecorationRole:
+                return self.icon
+            if role == Qt.UserRole:
+                return plugin
+        return NONE
+                
+            
+
+class CategoryModel(QStringListModel):
+    
+    def __init__(self, *args):
+        QStringListModel.__init__(self, *args)
+        self.setStringList([_('General'), _('Interface'), _('Advanced'), 
+                            _('Content\nServer'), _('Plugins')])
+        self.icons = list(map(QVariant, map(QIcon, 
+            [':/images/dialog_information.svg', ':/images/lookfeel.svg', 
+             ':/images/view.svg', ':/images/network-server.svg',
+             ':/images/plugins.svg'])))
+    
+    def data(self, index, role):
+        if role == Qt.DecorationRole:
+            return self.icons[index.row()]
+        return QStringListModel.data(self, index, role)
+            
 
 class ConfigDialog(QDialog, Ui_Dialog):
 
@@ -24,10 +140,11 @@ class ConfigDialog(QDialog, Ui_Dialog):
         Ui_Dialog.__init__(self)
         self.ICON_SIZES = {0:QSize(48, 48), 1:QSize(32,32), 2:QSize(24,24)}
         self.setupUi(self)
-        self.item1 = QListWidgetItem(QIcon(':/images/metadata.svg'), _('General'), self.category_list)
-        self.item2 = QListWidgetItem(QIcon(':/images/lookfeel.svg'), _('Interface'), self.category_list)
-        self.item3 = QListWidgetItem(QIcon(':/images/view.svg'), _('Advanced'), self.category_list)
-        self.item4 = QListWidgetItem(QIcon(':/images/network-server.svg'), _('Content\nServer'), self.category_list)
+        self._category_model = CategoryModel()
+        
+        self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
+        self.connect(self.category_view, SIGNAL('clicked(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
+        self.category_view.setModel(self._category_model)
         self.db = db
         self.server = server
         path = prefs['library_path']
@@ -69,7 +186,6 @@ class ConfigDialog(QDialog, Ui_Dialog):
         single_format = config['save_to_disk_single_format']
         self.single_format.setCurrentIndex(BOOK_EXTENSIONS.index(single_format))
         self.cover_browse.setValue(config['cover_flow_queue_length'])
-        self.confirm_delete.setChecked(config['confirm_delete'])
         from calibre.translations.compiled import translations
         from calibre.translations import language_codes
         from calibre.startup import get_lang
@@ -83,7 +199,6 @@ class ConfigDialog(QDialog, Ui_Dialog):
         for item in items:
             self.language.addItem(item[1], QVariant(item[0]))
             
-        self.output_format.setCurrentIndex(0 if prefs['output_format'] == 'LRF' else 1)
         self.pdf_metadata.setChecked(prefs['read_file_metadata'])
         
         added_html = False
@@ -109,6 +224,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
                      lambda s: self.password.setEchoMode(self.password.Normal if s == Qt.Checked else self.password.Password))
         self.password.setEchoMode(self.password.Password)
         opts = server_config().parse()
+        self.max_cover_size.setText(opts.max_cover)
         self.port.setValue(opts.port)
         self.username.setText(opts.username)
         self.password.setText(opts.password if opts.password else '')
@@ -116,6 +232,70 @@ class ConfigDialog(QDialog, Ui_Dialog):
         self.systray_icon.setChecked(config['systray_icon'])
         self.sync_news.setChecked(config['upload_news_to_device'])
         self.delete_news.setChecked(config['delete_news_from_library_on_upload'])
+        p = {'normal':0, 'high':1, 'low':2}[prefs['worker_process_priority']]
+        self.priority.setCurrentIndex(p)
+        self.priority.setVisible(iswindows)
+        self.priority_label.setVisible(iswindows)
+        self.category_view.setCurrentIndex(self._category_model.index(0))
+        self._plugin_model = PluginModel()
+        self.plugin_view.setModel(self._plugin_model)
+        self.connect(self.toggle_plugin, SIGNAL('clicked()'), lambda : self.modify_plugin(op='toggle'))
+        self.connect(self.customize_plugin, SIGNAL('clicked()'), lambda : self.modify_plugin(op='customize'))
+        self.connect(self.remove_plugin, SIGNAL('clicked()'), lambda : self.modify_plugin(op='remove'))
+        self.connect(self.button_plugin_browse, SIGNAL('clicked()'), self.find_plugin)
+        self.connect(self.button_plugin_add, SIGNAL('clicked()'), self.add_plugin)
+        self.separate_cover_flow.setChecked(config['separate_cover_flow'])
+    
+    def add_plugin(self):
+        path = unicode(self.plugin_path.text())
+        if path and os.access(path, os.R_OK) and path.lower().endswith('.zip'):
+            add_plugin(path)
+            self._plugin_model.populate()
+            self._plugin_model.reset()
+        else:
+            error_dialog(self, _('No valid plugin path'), 
+                         _('%s is not a valid plugin path')%path).exec_()
+    
+    def find_plugin(self):
+        path = choose_files(self, 'choose plugin dialog', _('Choose plugin'),
+                            filters=[('Plugins', ['zip'])], all_files=False, 
+                            select_only_single_file=True)
+        if path:
+            self.plugin_path.setText(path[0])
+    
+    def modify_plugin(self, op=''):
+        index = self.plugin_view.currentIndex()
+        if index.isValid():
+            plugin = self._plugin_model.index_to_plugin(index)
+            if not plugin.can_be_disabled:
+                error_dialog(self,_('Plugin cannot be disabled'), 
+                             _('The plugin: %s cannot be disabled')%plugin.name).exec_()
+                return
+            if op == 'toggle':
+                if is_disabled(plugin):
+                    enable_plugin(plugin)
+                else:
+                    disable_plugin(plugin)
+                self._plugin_model.refresh_plugin(plugin)
+            if op == 'customize':
+                if not plugin.is_customizable():
+                    info_dialog(self, _('Plugin not customizable'),
+                                _('Plugin: %s does not need customization')%plugin.name).exec_()
+                    return
+                help = plugin.customization_help()
+                text, ok = QInputDialog.getText(self, _('Customize %s')%plugin.name,
+                                                help)
+                if ok:
+                    customize_plugin(plugin, unicode(text))
+                    self._plugin_model.refresh_plugin(plugin)
+            if op == 'remove':
+                if remove_plugin(plugin):
+                    self._plugin_model.populate()
+                    self._plugin_model.reset()
+                else:
+                    error_dialog(self, _('Cannot remove builtin plugin'), 
+                                 plugin.name + _(' cannot be removed. It is a builtin plugin. Try disabling it instead.')).exec_()
+            
     
     def up_column(self):
         idx = self.columns.currentRow()
@@ -199,6 +379,10 @@ class ConfigDialog(QDialog, Ui_Dialog):
             self.directory_list.takeItem(idx)
 
     def accept(self):
+        mcs = unicode(self.max_cover_size.text()).strip()
+        if not re.match(r'\d+x\d+', mcs):
+            error_dialog(self, _('Invalid size'), _('The size %s is invalid. must be of the form widthxheight')%mcs).exec_()
+            return
         config['use_roman_numerals_for_series_number'] = bool(self.roman_numerals.isChecked())
         config['new_version_notification'] = bool(self.new_version_notification.isChecked())
         prefs['network_timeout'] = int(self.timeout.value())
@@ -209,9 +393,11 @@ class ConfigDialog(QDialog, Ui_Dialog):
         config['column_map'] = cols
         config['toolbar_icon_size'] = self.ICON_SIZES[self.toolbar_button_size.currentIndex()]
         config['show_text_in_toolbar'] = bool(self.show_toolbar_text.isChecked())
-        config['confirm_delete'] =  bool(self.confirm_delete.isChecked())
+        config['separate_cover_flow'] = bool(self.separate_cover_flow.isChecked())
         pattern = self.filename_pattern.commit()
         prefs['filename_pattern'] = pattern
+        p = {0:'normal', 1:'high', 2:'low'}[self.priority.currentIndex()]
+        prefs['worker_process_priority'] = p
         prefs['read_file_metadata'] = bool(self.pdf_metadata.isChecked())
         config['save_to_disk_single_format'] = BOOK_EXTENSIONS[self.single_format.currentIndex()]
         config['cover_flow_queue_length'] = self.cover_browse.value()
@@ -222,18 +408,14 @@ class ConfigDialog(QDialog, Ui_Dialog):
         sc.set('username', unicode(self.username.text()).strip())
         sc.set('password', unicode(self.password.text()).strip())
         sc.set('port', self.port.value())
+        sc.set('max_cover', mcs)
         config['delete_news_from_library_on_upload'] = self.delete_news.isChecked()
         config['upload_news_to_device'] = self.sync_news.isChecked()
-        of = str(self.output_format.currentText())
         fmts = []
         for i in range(self.viewer.count()):
             if self.viewer.item(i).checkState() == Qt.Checked:
                 fmts.append(str(self.viewer.item(i).text()))
         config['internally_viewed_formats'] = fmts
-        if of != prefs['output_format'] and 'epub' in of.lower():
-            warning_dialog(self, 'Warning', 
-                '<p>EPUB support is still in beta. If you find bugs, please report them by opening a <a href="http://calibre.kovidgoyal.net">ticket</a>.').exec_()
-        prefs['output_format'] = of 
         
         if not path or not os.path.exists(path) or not os.path.isdir(path):
             d = error_dialog(self, _('Invalid database location'),
diff --git a/src/calibre/gui2/dialogs/config.ui b/src/calibre/gui2/dialogs/config.ui
index 776855fa7c..7f678ce8ea 100644
--- a/src/calibre/gui2/dialogs/config.ui
+++ b/src/calibre/gui2/dialogs/config.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>709</width>
-    <height>563</height>
+    <width>800</width>
+    <height>570</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -21,12 +21,12 @@
    <item row="0" column="0" >
     <layout class="QHBoxLayout" >
      <item>
-      <widget class="QListWidget" name="category_list" >
-       <property name="maximumSize" >
-        <size>
-         <width>140</width>
-         <height>16777215</height>
-        </size>
+      <widget class="QListView" name="category_view" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Expanding" hsizetype="MinimumExpanding" >
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="font" >
         <font>
@@ -34,43 +34,43 @@
          <bold>true</bold>
         </font>
        </property>
-       <property name="mouseTracking" >
-        <bool>true</bool>
-       </property>
-       <property name="verticalScrollBarPolicy" >
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
-       <property name="horizontalScrollBarPolicy" >
-        <enum>Qt::ScrollBarAlwaysOff</enum>
-       </property>
        <property name="tabKeyNavigation" >
         <bool>true</bool>
        </property>
+       <property name="showDropIndicator" stdset="0" >
+        <bool>false</bool>
+       </property>
        <property name="iconSize" >
         <size>
          <width>48</width>
          <height>48</height>
         </size>
        </property>
-       <property name="movement" >
-        <enum>QListView::Static</enum>
+       <property name="verticalScrollMode" >
+        <enum>QAbstractItemView::ScrollPerItem</enum>
+       </property>
+       <property name="horizontalScrollMode" >
+        <enum>QAbstractItemView::ScrollPerPixel</enum>
        </property>
        <property name="flow" >
         <enum>QListView::TopToBottom</enum>
        </property>
-       <property name="isWrapping" stdset="0" >
-        <bool>false</bool>
-       </property>
        <property name="spacing" >
-        <number>25</number>
+        <number>20</number>
        </property>
        <property name="viewMode" >
-        <enum>QListView::IconMode</enum>
+        <enum>QListView::ListMode</enum>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QStackedWidget" name="stackedWidget" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+         <horstretch>100</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="currentIndex" >
         <number>0</number>
        </property>
@@ -127,17 +127,10 @@
            </property>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="confirm_delete" >
-           <property name="text" >
-            <string>Ask for &amp;confirmation before deleting files</string>
-           </property>
-          </widget>
-         </item>
          <item>
           <widget class="QCheckBox" name="pdf_metadata" >
            <property name="toolTip" >
-            <string>If you disable this setting, metadatas is guessed from the filename instead. This can be configured in the Advanced section.</string>
+            <string>If you disable this setting, metadata is guessed from the filename instead. This can be configured in the Advanced section.</string>
            </property>
            <property name="text" >
             <string>Read &amp;metadata from files</string>
@@ -149,7 +142,7 @@
          </item>
          <item>
           <layout class="QGridLayout" name="gridLayout_2" >
-           <item row="1" column="0" >
+           <item row="0" column="0" >
             <widget class="QLabel" name="label_5" >
              <property name="text" >
               <string>Format for &amp;single file save:</string>
@@ -159,10 +152,10 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="1" >
+           <item row="0" column="1" >
             <widget class="QComboBox" name="single_format" />
            </item>
-           <item row="2" column="0" >
+           <item row="1" column="0" >
             <widget class="QLabel" name="label_2" >
              <property name="text" >
               <string>Default network &amp;timeout:</string>
@@ -172,7 +165,7 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="1" >
+           <item row="1" column="1" >
             <widget class="QSpinBox" name="timeout" >
              <property name="toolTip" >
               <string>Set the default timeout for network fetches (i.e. anytime we go out to the internet to get information)</string>
@@ -191,10 +184,10 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="1" >
+           <item row="2" column="1" >
             <widget class="QComboBox" name="language" />
            </item>
-           <item row="3" column="0" >
+           <item row="2" column="0" >
             <widget class="QLabel" name="label_7" >
              <property name="text" >
               <string>Choose &amp;language (requires restart):</string>
@@ -204,30 +197,32 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="1" >
-            <widget class="QComboBox" name="output_format" >
-             <property name="toolTip" >
-              <string>The default output format for ebook conversions.</string>
-             </property>
+           <item row="3" column="1" >
+            <widget class="QComboBox" name="priority" >
              <item>
               <property name="text" >
-               <string>LRF</string>
+               <string>Normal</string>
               </property>
              </item>
              <item>
               <property name="text" >
-               <string>EPUB</string>
+               <string>High</string>
+              </property>
+             </item>
+             <item>
+              <property name="text" >
+               <string>Low</string>
               </property>
              </item>
             </widget>
            </item>
-           <item row="0" column="0" >
-            <widget class="QLabel" name="label_8" >
+           <item row="3" column="0" >
+            <widget class="QLabel" name="priority_label" >
              <property name="text" >
-              <string>&amp;Output format:</string>
+              <string>Job &amp;priority:</string>
              </property>
              <property name="buddy" >
-              <cstring>output_format</cstring>
+              <cstring>priority</cstring>
              </property>
             </widget>
            </item>
@@ -361,7 +356,7 @@
            </item>
           </layout>
          </item>
-         <item row="5" column="0" >
+         <item row="7" column="0" >
           <widget class="QGroupBox" name="groupBox_2" >
            <property name="title" >
             <string>Toolbar</string>
@@ -409,7 +404,7 @@
            </layout>
           </widget>
          </item>
-         <item row="6" column="0" >
+         <item row="8" column="0" >
           <widget class="QGroupBox" name="groupBox" >
            <property name="title" >
             <string>Select visible &amp;columns in library view</string>
@@ -497,20 +492,27 @@
            </property>
           </widget>
          </item>
-         <item row="3" column="0" >
+         <item row="4" column="0" >
           <widget class="QCheckBox" name="sync_news" >
            <property name="text" >
             <string>Automatically send downloaded &amp;news to ebook reader</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0" >
+         <item row="5" column="0" >
           <widget class="QCheckBox" name="delete_news" >
            <property name="text" >
             <string>&amp;Delete news from library when it is sent to reader</string>
            </property>
           </widget>
          </item>
+         <item row="3" column="0" >
+          <widget class="QCheckBox" name="separate_cover_flow" >
+           <property name="text" >
+            <string>Show cover &amp;browser in a separate window (needs restart)</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_2" >
@@ -646,13 +648,33 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="1" >
+           <item row="4" column="1" >
             <widget class="QCheckBox" name="show_server_password" >
              <property name="text" >
               <string>&amp;Show password</string>
              </property>
             </widget>
            </item>
+           <item row="3" column="1" >
+            <widget class="QLineEdit" name="max_cover_size" >
+             <property name="toolTip" >
+              <string>The maximum size (widthxheight) for displayed covers. Larger covers are resized. </string>
+             </property>
+             <property name="text" >
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" >
+            <widget class="QLabel" name="label_3" >
+             <property name="text" >
+              <string>Max. &amp;cover size:</string>
+             </property>
+             <property name="buddy" >
+              <cstring>max_cover_size</cstring>
+             </property>
+            </widget>
+           </item>
           </layout>
          </item>
          <item>
@@ -745,6 +767,122 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="page_5" >
+        <layout class="QVBoxLayout" name="verticalLayout_6" >
+         <item>
+          <widget class="QLabel" name="label_8" >
+           <property name="text" >
+            <string>Here you can customize the behavior of Calibre by controlling what plugins it uses.</string>
+           </property>
+           <property name="wordWrap" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QTreeView" name="plugin_view" >
+           <property name="iconSize" >
+            <size>
+             <width>32</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="animated" >
+            <bool>true</bool>
+           </property>
+           <property name="headerHidden" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_6" >
+           <item>
+            <widget class="QPushButton" name="toggle_plugin" >
+             <property name="text" >
+              <string>Enable/&amp;Disable plugin</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="customize_plugin" >
+             <property name="text" >
+              <string>&amp;Customize plugin</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="remove_plugin" >
+             <property name="text" >
+              <string>&amp;Remove plugin</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_4" >
+           <property name="title" >
+            <string>Add new plugin</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_5" >
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_5" >
+              <item>
+               <widget class="QLabel" name="label_14" >
+                <property name="text" >
+                 <string>Plugin &amp;file:</string>
+                </property>
+                <property name="buddy" >
+                 <cstring>plugin_path</cstring>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLineEdit" name="plugin_path" />
+              </item>
+              <item>
+               <widget class="QToolButton" name="button_plugin_browse" >
+                <property name="text" >
+                 <string>...</string>
+                </property>
+                <property name="icon" >
+                 <iconset resource="../images.qrc" >
+                  <normaloff>:/images/document_open.svg</normaloff>:/images/document_open.svg</iconset>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout_4" >
+              <item>
+               <spacer name="horizontalSpacer_2" >
+                <property name="orientation" >
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0" >
+                 <size>
+                  <width>40</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QPushButton" name="button_plugin_add" >
+                <property name="text" >
+                 <string>&amp;Add</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
       </widget>
      </item>
     </layout>
@@ -772,8 +910,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>235</x>
-     <y>671</y>
+     <x>239</x>
+     <y>558</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -788,8 +926,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>303</x>
-     <y>671</y>
+     <x>307</x>
+     <y>558</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
@@ -797,21 +935,5 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>category_list</sender>
-   <signal>currentRowChanged(int)</signal>
-   <receiver>stackedWidget</receiver>
-   <slot>setCurrentIndex(int)</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>142</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>256</x>
-     <y>7</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/src/calibre/gui2/dialogs/confirm_delete.py b/src/calibre/gui2/dialogs/confirm_delete.py
new file mode 100644
index 0000000000..08db53e9a7
--- /dev/null
+++ b/src/calibre/gui2/dialogs/confirm_delete.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env  python
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
+__docformat__ = 'restructuredtext en'
+
+from calibre.gui2 import dynamic
+from calibre.gui2.dialogs.confirm_delete_ui import Ui_Dialog
+from PyQt4.Qt import QDialog, SIGNAL
+
+def _config_name(name):
+    return name + '_again'
+
+class Dialog(QDialog, Ui_Dialog):
+    
+    def __init__(self, msg, name, parent):
+        QDialog.__init__(self, parent)
+        self.setupUi(self)
+        
+        self.msg.setText(msg)
+        self.name = name
+        self.connect(self.again, SIGNAL('stateChanged(int)'), self.toggle)
+        
+
+    def toggle(self, x):
+        dynamic[_config_name(self.name)] = self.again.isChecked()
+        
+def confirm(msg, name, parent=None):
+    if not dynamic.get(_config_name(name), True):
+        return True
+    d = Dialog(msg, name, parent)
+    return d.exec_() == d.Accepted
\ No newline at end of file
diff --git a/src/calibre/gui2/dialogs/confirm_delete.ui b/src/calibre/gui2/dialogs/confirm_delete.ui
new file mode 100644
index 0000000000..1ee4cb79d9
--- /dev/null
+++ b/src/calibre/gui2/dialogs/confirm_delete.ui
@@ -0,0 +1,100 @@
+<ui version="4.0" >
+ <class>Dialog</class>
+ <widget class="QDialog" name="Dialog" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>439</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Are you sure?</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="../images.qrc" >
+    <normaloff>:/images/dialog_warning.svg</normaloff>:/images/dialog_warning.svg</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="pixmap" >
+        <pixmap resource="../images.qrc" >:/images/dialog_warning.svg</pixmap>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="msg" >
+       <property name="text" >
+        <string>TextLabel</string>
+       </property>
+       <property name="wordWrap" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QCheckBox" name="again" >
+     <property name="text" >
+      <string>&amp;Show this warning again</string>
+     </property>
+     <property name="checked" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QDialogButtonBox" name="buttonBox" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons" >
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../images.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>Dialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>Dialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/calibre/gui2/dialogs/epub.ui b/src/calibre/gui2/dialogs/epub.ui
index 88a59cc803..871a401fbb 100644
--- a/src/calibre/gui2/dialogs/epub.ui
+++ b/src/calibre/gui2/dialogs/epub.ui
@@ -77,7 +77,7 @@
      <item>
       <widget class="QStackedWidget" name="stack" >
        <property name="currentIndex" >
-        <number>1</number>
+        <number>3</number>
        </property>
        <widget class="QWidget" name="metadata_page" >
         <layout class="QGridLayout" name="gridLayout_4" >
@@ -89,36 +89,6 @@
               <string>Book Cover</string>
              </property>
              <layout class="QGridLayout" name="_2" >
-              <item row="0" column="0" >
-               <layout class="QHBoxLayout" name="_3" >
-                <item>
-                 <widget class="ImageView" name="cover" >
-                  <property name="text" >
-                   <string/>
-                  </property>
-                  <property name="pixmap" >
-                   <pixmap resource="../images.qrc" >:/images/book.svg</pixmap>
-                  </property>
-                  <property name="scaledContents" >
-                   <bool>true</bool>
-                  </property>
-                  <property name="alignment" >
-                   <set>Qt::AlignCenter</set>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item row="2" column="0" >
-               <widget class="QCheckBox" name="opt_prefer_metadata_cover" >
-                <property name="text" >
-                 <string>Use cover from &amp;source file</string>
-                </property>
-                <property name="checked" >
-                 <bool>true</bool>
-                </property>
-               </widget>
-              </item>
               <item row="1" column="0" >
                <layout class="QVBoxLayout" name="_4" >
                 <property name="spacing" >
@@ -170,6 +140,36 @@
                 </item>
                </layout>
               </item>
+              <item row="2" column="0" >
+               <widget class="QCheckBox" name="opt_prefer_metadata_cover" >
+                <property name="text" >
+                 <string>Use cover from &amp;source file</string>
+                </property>
+                <property name="checked" >
+                 <bool>true</bool>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="0" >
+               <layout class="QHBoxLayout" name="_3" >
+                <item>
+                 <widget class="ImageView" name="cover" >
+                  <property name="text" >
+                   <string/>
+                  </property>
+                  <property name="pixmap" >
+                   <pixmap resource="../images.qrc" >:/images/book.svg</pixmap>
+                  </property>
+                  <property name="scaledContents" >
+                   <bool>true</bool>
+                  </property>
+                  <property name="alignment" >
+                   <set>Qt::AlignCenter</set>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </item>
              </layout>
              <zorder>opt_prefer_metadata_cover</zorder>
              <zorder></zorder>
diff --git a/src/calibre/gui2/dialogs/jobs.py b/src/calibre/gui2/dialogs/jobs.py
index ced7f2ee10..5b97934a84 100644
--- a/src/calibre/gui2/dialogs/jobs.py
+++ b/src/calibre/gui2/dialogs/jobs.py
@@ -36,11 +36,11 @@ class JobsDialog(QDialog, Ui_JobsDialog):
         self.model = model
         self.setWindowModality(Qt.NonModal)
         self.setWindowTitle(__appname__ + _(' - Jobs'))
-        QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'), 
+        QObject.connect(self.jobs_view.model(), SIGNAL('modelReset()'),
                         self.jobs_view.resizeColumnsToContents)
         QObject.connect(self.kill_button, SIGNAL('clicked()'),
                         self.kill_job)
-        QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'), 
+        QObject.connect(self, SIGNAL('kill_job(int, PyQt_PyObject)'),
                         self.jobs_view.model().kill_job)
         self.pb_delegate = ProgressBarDelegate(self)
         self.jobs_view.setItemDelegateForColumn(2, self.pb_delegate)
@@ -49,11 +49,8 @@ class JobsDialog(QDialog, Ui_JobsDialog):
         self.connect(self.running_time_timer, SIGNAL('timeout()'), self.update_running_time)
         self.running_time_timer.start(1000)
         
-    def update_running_time(self):
-        model = self.model
-        for row, job in enumerate(model.jobs):
-            if job.is_running:
-                self.jobs_view.dataChanged(model.index(row, 3), model.index(row, 3))    
+    def update_running_time(self, *args):
+        self.model.running_time_updated()
     
     def kill_job(self):
         for index in self.jobs_view.selectedIndexes():
diff --git a/src/calibre/gui2/dialogs/lrf_single.ui b/src/calibre/gui2/dialogs/lrf_single.ui
index f08265fe9e..8ed4799342 100644
--- a/src/calibre/gui2/dialogs/lrf_single.ui
+++ b/src/calibre/gui2/dialogs/lrf_single.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>866</width>
-    <height>671</height>
+    <height>679</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -115,7 +115,7 @@
           <item row="0" column="0" >
            <widget class="QStackedWidget" name="stack" >
             <property name="currentIndex" >
-             <number>0</number>
+             <number>1</number>
             </property>
             <widget class="QWidget" name="metadata_page" >
              <layout class="QHBoxLayout" >
@@ -652,7 +652,7 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="1" column="0" >
+                 <item row="2" column="0" >
                   <widget class="QLabel" name="label_10" >
                    <property name="text" >
                     <string>&amp;Header format:</string>
@@ -662,9 +662,26 @@
                    </property>
                   </widget>
                  </item>
-                 <item row="1" column="1" >
+                 <item row="2" column="1" >
                   <widget class="QLineEdit" name="gui_headerformat" />
                  </item>
+                 <item row="1" column="1" >
+                  <widget class="QSpinBox" name="gui_header_separation" >
+                   <property name="suffix" >
+                    <string> px</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item row="1" column="0" >
+                  <widget class="QLabel" name="label_29" >
+                   <property name="text" >
+                    <string>Header &amp;separation:</string>
+                   </property>
+                   <property name="buddy" >
+                    <cstring>gui_header_separation</cstring>
+                   </property>
+                  </widget>
+                 </item>
                 </layout>
                </widget>
               </item>
@@ -985,8 +1002,8 @@
              <string>&lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
 &lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
 p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;">
-&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">&lt;/p>&lt;/body>&lt;/html></string>
+&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
+&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'DejaVu Sans';">&lt;/p>&lt;/body>&lt;/html></string>
             </property>
            </widget>
           </item>
@@ -1078,12 +1095,12 @@ p, li { white-space: pre-wrap; }
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>650</x>
-     <y>122</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>788</x>
-     <y>140</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
    </hints>
   </connection>
@@ -1094,12 +1111,12 @@ p, li { white-space: pre-wrap; }
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>543</x>
-     <y>122</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>544</x>
-     <y>211</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
    </hints>
   </connection>
@@ -1110,12 +1127,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>298</x>
-     <y>398</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>660</x>
-     <y>435</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
    </hints>
   </connection>
@@ -1126,12 +1143,12 @@ p, li { white-space: pre-wrap; }
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>330</x>
-     <y>367</y>
+     <x>345</x>
+     <y>363</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>823</x>
-     <y>372</y>
+     <x>837</x>
+     <y>435</y>
     </hint>
    </hints>
   </connection>
@@ -1142,12 +1159,28 @@ p, li { white-space: pre-wrap; }
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>344</x>
-     <y>107</y>
+     <x>308</x>
+     <y>74</y>
     </hint>
     <hint type="destinationlabel" >
-     <x>489</x>
-     <y>465</y>
+     <x>308</x>
+     <y>74</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>gui_header</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>gui_header_separation</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>261</x>
+     <y>346</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>379</x>
+     <y>378</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py
index db60693fa7..132355b12a 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.py
+++ b/src/calibre/gui2/dialogs/metadata_bulk.py
@@ -9,9 +9,10 @@ from PyQt4.QtGui import QDialog
 from calibre.gui2 import qstring_to_unicode
 from calibre.gui2.dialogs.metadata_bulk_ui import Ui_MetadataBulkDialog
 from calibre.gui2.dialogs.tag_editor import TagEditor
-from calibre.ebooks.metadata import string_to_authors
+from calibre.ebooks.metadata import string_to_authors, authors_to_sort_string
 
 class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
+    
     def __init__(self, window, rows, db):
         QDialog.__init__(self, window)
         Ui_MetadataBulkDialog.__init__(self)
@@ -54,8 +55,15 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
             if au:
                 au = string_to_authors(au)
                 self.db.set_authors(id, au, notify=False)
+            if self.auto_author_sort.isChecked():
+                aut = self.db.authors(id, index_is_id=True)
+                aut = aut if aut else ''
+                aut = [a.strip().replace('|', ',') for a in aut.strip().split(',')]
+                x = authors_to_sort_string(aut)
+                if x:
+                    self.db.set_author_sort(id, x, notify=False)
             aus = qstring_to_unicode(self.author_sort.text())
-            if aus:
+            if aus and self.author_sort.isEnabled():
                 self.db.set_author_sort(id, aus, notify=False)
             if self.write_rating:
                 self.db.set_rating(id, 2*self.rating.value(), notify=False)
diff --git a/src/calibre/gui2/dialogs/metadata_bulk.ui b/src/calibre/gui2/dialogs/metadata_bulk.ui
index b4a4106d87..4597b987f5 100644
--- a/src/calibre/gui2/dialogs/metadata_bulk.ui
+++ b/src/calibre/gui2/dialogs/metadata_bulk.ui
@@ -56,7 +56,7 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="0" >
+          <item row="2" column="0" >
            <widget class="QLabel" name="label_8" >
             <property name="text" >
              <string>Author S&amp;ort: </string>
@@ -69,14 +69,14 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="2" >
+          <item row="2" column="1" colspan="2" >
            <widget class="QLineEdit" name="author_sort" >
             <property name="toolTip" >
              <string>Specify how the author(s) of this book should be sorted. For example Charles Dickens should be sorted as Dickens, Charles.</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0" >
+          <item row="3" column="0" >
            <widget class="QLabel" name="label_6" >
             <property name="text" >
              <string>&amp;Rating:</string>
@@ -89,7 +89,7 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1" colspan="2" >
+          <item row="3" column="1" colspan="2" >
            <widget class="QSpinBox" name="rating" >
             <property name="toolTip" >
              <string>Rating of this book. 0-5 stars</string>
@@ -108,7 +108,7 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0" >
+          <item row="4" column="0" >
            <widget class="QLabel" name="label_3" >
             <property name="text" >
              <string>&amp;Publisher: </string>
@@ -121,14 +121,14 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="1" colspan="2" >
+          <item row="4" column="1" colspan="2" >
            <widget class="QLineEdit" name="publisher" >
             <property name="toolTip" >
              <string>Change the publisher of this book</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" >
+          <item row="5" column="0" >
            <widget class="QLabel" name="label_4" >
             <property name="text" >
              <string>Add Ta&amp;gs: </string>
@@ -141,14 +141,14 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1" >
+          <item row="5" column="1" >
            <widget class="QLineEdit" name="tags" >
             <property name="toolTip" >
              <string>Tags categorize the book. This is particularly useful while searching. &lt;br>&lt;br>They can be any words or phrases, separated by commas.</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="2" >
+          <item row="5" column="2" >
            <widget class="QToolButton" name="tag_editor_button" >
             <property name="toolTip" >
              <string>Open Tag Editor</string>
@@ -162,7 +162,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0" >
+          <item row="6" column="0" >
            <widget class="QLabel" name="label" >
             <property name="text" >
              <string>&amp;Remove tags:</string>
@@ -172,14 +172,14 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="1" colspan="2" >
+          <item row="6" column="1" colspan="2" >
            <widget class="QLineEdit" name="remove_tags" >
             <property name="toolTip" >
              <string>Comma separated list of tags to remove from the books. </string>
             </property>
            </widget>
           </item>
-          <item row="6" column="0" >
+          <item row="7" column="0" >
            <widget class="QLabel" name="label_7" >
             <property name="text" >
              <string>&amp;Series:</string>
@@ -195,7 +195,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="1" >
+          <item row="7" column="1" >
            <widget class="QComboBox" name="series" >
             <property name="toolTip" >
              <string>List of known series. You can add new series.</string>
@@ -214,10 +214,10 @@
             </property>
            </widget>
           </item>
-          <item row="7" column="1" >
+          <item row="8" column="1" >
            <widget class="QComboBox" name="remove_format" />
           </item>
-          <item row="7" column="0" >
+          <item row="8" column="0" >
            <widget class="QLabel" name="label_5" >
             <property name="text" >
              <string>Remove &amp;format:</string>
@@ -227,6 +227,13 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="1" >
+           <widget class="QCheckBox" name="auto_author_sort" >
+            <property name="text" >
+             <string>A&amp;utomatically set author sort</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -257,8 +264,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
+     <x>252</x>
+     <y>382</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -273,8 +280,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
+     <x>320</x>
+     <y>382</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
@@ -282,5 +289,21 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>auto_author_sort</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>author_sort</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>240</x>
+     <y>95</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>240</x>
+     <y>113</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 832d47238f..4915c87e7d 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -7,11 +7,11 @@ add/remove formats
 import os
 
 from PyQt4.QtCore import SIGNAL, QObject, QCoreApplication, Qt
-from PyQt4.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog
+from PyQt4.QtGui import QPixmap, QListWidgetItem, QErrorMessage, QDialog, QCompleter
 
 
 from calibre.gui2 import qstring_to_unicode, error_dialog, file_icon_provider, \
-                           choose_files, pixmap_to_data, choose_images, import_format
+                           choose_files, pixmap_to_data, choose_images
 from calibre.gui2.dialogs.metadata_single_ui import Ui_MetadataSingleDialog
 from calibre.gui2.dialogs.fetch_metadata import FetchMetadata
 from calibre.gui2.dialogs.tag_editor import TagEditor
@@ -20,7 +20,9 @@ from calibre.ebooks import BOOK_EXTENSIONS
 from calibre.ebooks.metadata import authors_to_sort_string, string_to_authors, authors_to_string
 from calibre.ebooks.metadata.library_thing import login, cover_from_isbn, LibraryThingError
 from calibre import islinux
+from calibre.ebooks.metadata.meta import get_metadata
 from calibre.utils.config import prefs
+from calibre.customize.ui import run_plugins_on_import
 
 class Format(QListWidgetItem):
     def __init__(self, parent, ext, size, path=None):
@@ -31,6 +33,13 @@ class Format(QListWidgetItem):
         QListWidgetItem.__init__(self, file_icon_provider().icon_from_ext(ext), 
                                  text, parent, QListWidgetItem.UserType)
 
+class AuthorCompleter(QCompleter):
+    
+    def __init__(self, db):
+        all_authors = db.all_authors()
+        all_authors.sort(cmp=lambda x, y : cmp(x[1], y[1]))
+        QCompleter.__init__(self, [x[1] for x in all_authors])
+
 class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
     
     def do_reset_cover(self, *args):
@@ -84,13 +93,9 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
                 QErrorMessage(self.window).showMessage("You do not have "+\
                                     "permission to read the file: " + _file)
                 continue
-            nf = import_format(_file)[0]
-            if nf is not None:
-                _file = nf
+            _file = run_plugins_on_import(_file)
             size = os.stat(_file).st_size
-            ext = os.path.splitext(_file)[1].lower()
-            if '.' in ext:
-                ext = ext.replace('.', '')
+            ext = os.path.splitext(_file)[1].lower().replace('.', '')
             for row in range(self.formats.count()):
                 fmt = self.formats.item(row)
                 if fmt.ext == ext:
@@ -105,6 +110,39 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
             self.formats.takeItem(row.row())
             self.formats_changed = True
     
+    def set_cover(self):
+        row = self.formats.currentRow()
+        fmt = self.formats.item(row)
+        ext = fmt.ext.lower()
+        if fmt.path is None:
+            stream = self.db.format(self.row, ext, as_file=True)
+        else:
+            stream = open(fmt.path, 'r+b')
+        try:
+            mi = get_metadata(stream, ext)
+        except:
+            error_dialog(self, _('Could not read metadata'), 
+                         _('Could not read metadata from %s format')%ext).exec_()
+            return
+        cdata = None
+        if mi.cover and os.access(mi.cover, os.R_OK):
+            cdata = open(mi.cover).read()
+        elif mi.cover_data[1] is not None:
+            cdata = mi.cover_data[1]
+        if cdata is None:
+            error_dialog(self, _('Could not read cover'), 
+                         _('Could not read cover from %s format')%ext).exec_()
+            return
+        pix = QPixmap()
+        pix.loadFromData(cdata)
+        if pix.isNull():
+            error_dialog(self, _('Could not read cover'), 
+                         _('The cover in the %s format is invalid')%ext).exec_()
+            return
+        self.cover.setPixmap(pix)
+        self.cover_changed = True
+        self.cpixmap = pix
+    
     def sync_formats(self):
         old_extensions, new_extensions, paths = set(), set(), {}
         for row in range(self.formats.count()):
@@ -129,6 +167,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
         QDialog.__init__(self, window)
         Ui_MetadataSingleDialog.__init__(self)        
         self.setupUi(self)
+        self.bc_box.layout().setAlignment(self.cover, Qt.AlignCenter|Qt.AlignHCenter)
         self.splitter.setStretchFactor(100, 1)
         self.db = db
         self.accepted_callback = accepted_callback
@@ -139,6 +178,8 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
         self.cover_changed = False
         self.cpixmap = None
         self.cover.setAcceptDrops(True)
+        self._author_completer = AuthorCompleter(self.db)
+        self.authors.setCompleter(self._author_completer)
         self.connect(self.cover, SIGNAL('cover_changed()'), self.cover_dropped)
         QObject.connect(self.cover_button, SIGNAL("clicked(bool)"), \
                                                     self.select_cover)
@@ -157,6 +198,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
                         self.remove_unused_series)
         QObject.connect(self.auto_author_sort, SIGNAL('clicked()'),
                         self.deduce_author_sort)
+        self.connect(self.button_set_cover, SIGNAL('clicked()'), self.set_cover)
         self.connect(self.reset_cover, SIGNAL('clicked()'), self.do_reset_cover)
         self.connect(self.swap_button, SIGNAL('clicked()'), self.swap_title_author)
         self.timeout = float(prefs['network_timeout'])
@@ -173,8 +215,6 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
             self.authors.setText('')
         aus = self.db.author_sort(row)
         self.author_sort.setText(aus if aus else '')
-        pub = self.db.publisher(row)
-        self.publisher.setText(pub if pub else '')
         tags = self.db.tags(row)
         self.tags.setText(tags if tags else '')
         rating = self.db.rating(row)
@@ -192,8 +232,9 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
                     ext = ''
                 size = self.db.sizeof_format(row, ext)
                 Format(self.formats, ext, size)
+        
             
-        self.initialize_series()
+        self.initialize_series_and_publisher()
             
         self.series_index.setValue(self.db.series_index(row))
         QObject.connect(self.series, SIGNAL('currentIndexChanged(int)'), self.enable_series_index)
@@ -226,7 +267,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
     def cover_dropped(self):
         self.cover_changed = True
     
-    def initialize_series(self):
+    def initialize_series_and_publisher(self):
         all_series = self.db.all_series()
         all_series.sort(cmp=lambda x, y : cmp(x[1], y[1]))
         series_id = self.db.series_id(self.row)
@@ -249,6 +290,22 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
             if l:
                 l.invalidate()
                 l.activate()
+        
+        all_publishers = self.db.all_publishers()
+        all_publishers.sort(cmp=lambda x, y : cmp(x[1], y[1]))
+        publisher_id = self.db.publisher_id(self.row)
+        idx, c = None, 0
+        for i in all_publishers:
+            id, name = i
+            if id == publisher_id:
+                idx = c
+            self.publisher.addItem(name)
+            c += 1
+        
+        self.publisher.setEditText('')
+        if idx is not None:
+            self.publisher.setCurrentIndex(idx)
+        
                 
         self.layout().activate()
     
@@ -304,7 +361,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
         isbn   = qstring_to_unicode(self.isbn.text())
         title  = qstring_to_unicode(self.title.text())
         author = string_to_authors(unicode(self.authors.text()))[0]
-        publisher = qstring_to_unicode(self.publisher.text()) 
+        publisher = qstring_to_unicode(self.publisher.currentText()) 
         if isbn or title or author or publisher:
             d = FetchMetadata(self, isbn, title, author, publisher, self.timeout)
             d.exec_()
@@ -314,7 +371,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
                     self.title.setText(book.title)
                     self.authors.setText(authors_to_string(book.authors))
                     if book.author_sort: self.author_sort.setText(book.author_sort)
-                    if book.publisher: self.publisher.setText(book.publisher)
+                    if book.publisher: self.publisher.setEditText(book.publisher)
                     if book.isbn: self.isbn.setText(book.isbn)
                     summ = book.comments
                     if summ:
@@ -353,7 +410,7 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
             self.db.set_author_sort(self.id, aus, notify=False)
         self.db.set_isbn(self.id, qstring_to_unicode(self.isbn.text()), notify=False)
         self.db.set_rating(self.id, 2*self.rating.value(), notify=False)
-        self.db.set_publisher(self.id, qstring_to_unicode(self.publisher.text()), notify=False)
+        self.db.set_publisher(self.id, qstring_to_unicode(self.publisher.currentText()), notify=False)
         self.db.set_tags(self.id, qstring_to_unicode(self.tags.text()).split(','), notify=False)
         self.db.set_series(self.id, qstring_to_unicode(self.series.currentText()), notify=False)
         self.db.set_series_index(self.id, self.series_index.value(), notify=False)
diff --git a/src/calibre/gui2/dialogs/metadata_single.ui b/src/calibre/gui2/dialogs/metadata_single.ui
index 3c1a4a5e8e..00215180d6 100644
--- a/src/calibre/gui2/dialogs/metadata_single.ui
+++ b/src/calibre/gui2/dialogs/metadata_single.ui
@@ -95,13 +95,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="authors" >
-            <property name="toolTip" >
-             <string>Change the author(s) of this book. Multiple authors should be separated by an &amp;. If the author name contains an &amp;, use &amp;&amp; to represent it.</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0" >
            <widget class="QLabel" name="label_8" >
             <property name="text" >
@@ -111,7 +104,7 @@
              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
             <property name="buddy" >
-             <cstring>authors</cstring>
+             <cstring>author_sort</cstring>
             </property>
            </widget>
           </item>
@@ -185,13 +178,6 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1" colspan="2" >
-           <widget class="QLineEdit" name="publisher" >
-            <property name="toolTip" >
-             <string>Change the publisher of this book</string>
-            </property>
-           </widget>
-          </item>
           <item row="5" column="0" >
            <widget class="QLabel" name="label_4" >
             <property name="text" >
@@ -330,6 +316,16 @@
           <item row="8" column="1" colspan="2" >
            <widget class="QLineEdit" name="isbn" />
           </item>
+          <item row="4" column="1" >
+           <widget class="QComboBox" name="publisher" >
+            <property name="editable" >
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLineEdit" name="authors" />
+          </item>
          </layout>
         </widget>
        </item>
@@ -370,7 +366,7 @@
          <layout class="QVBoxLayout" name="verticalLayout" >
           <item>
            <layout class="QGridLayout" name="gridLayout" >
-            <item rowspan="2" row="0" column="0" >
+            <item rowspan="3" row="0" column="0" >
              <widget class="QListWidget" name="formats" >
               <property name="sizePolicy" >
                <sizepolicy vsizetype="Minimum" hsizetype="Minimum" >
@@ -412,7 +408,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1" >
+            <item row="2" column="1" >
              <widget class="QToolButton" name="remove_format_button" >
               <property name="toolTip" >
                <string>Remove the selected formats for this book from the database.</string>
@@ -432,6 +428,26 @@
               </property>
              </widget>
             </item>
+            <item row="1" column="1" >
+             <widget class="QToolButton" name="button_set_cover" >
+              <property name="toolTip" >
+               <string>Set the cover for the book from the selected format</string>
+              </property>
+              <property name="text" >
+               <string>...</string>
+              </property>
+              <property name="icon" >
+               <iconset resource="../images.qrc" >
+                <normaloff>:/images/book.svg</normaloff>:/images/book.svg</iconset>
+              </property>
+              <property name="iconSize" >
+               <size>
+                <width>32</width>
+                <height>32</height>
+               </size>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
          </layout>
@@ -439,7 +455,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_4" >
+        <widget class="QGroupBox" name="bc_box" >
          <property name="sizePolicy" >
           <sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
            <horstretch>0</horstretch>
@@ -595,8 +611,8 @@
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>257</x>
-     <y>646</y>
+     <x>261</x>
+     <y>710</y>
     </hint>
     <hint type="destinationlabel" >
      <x>157</x>
@@ -611,8 +627,8 @@
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel" >
-     <x>325</x>
-     <y>646</y>
+     <x>329</x>
+     <y>710</y>
     </hint>
     <hint type="destinationlabel" >
      <x>286</x>
diff --git a/src/calibre/gui2/dialogs/scheduler.py b/src/calibre/gui2/dialogs/scheduler.py
index d220cbadcc..f61c220bb9 100644
--- a/src/calibre/gui2/dialogs/scheduler.py
+++ b/src/calibre/gui2/dialogs/scheduler.py
@@ -155,10 +155,11 @@ class RecipeModel(QAbstractListModel, SearchQueryParser):
             return recipe
         elif role == Qt.DecorationRole:
             icon = self.default_icon
+            icon_path = (':/images/news/%s.png'%recipe.id).replace('recipe_', '') 
             if not recipe.builtin:
                 icon = self.custom_icon
-            elif QFile(':/images/news/%s.png'%recipe.id).exists():
-                icon = QIcon(':/images/news/%s.png'%recipe.id)
+            elif QFile().exists(icon_path):
+                icon = QIcon(icon_path)
             return QVariant(icon)
         
         return NONE
@@ -231,6 +232,7 @@ class SchedulerDialog(QDialog, Ui_Dialog):
         self.connect(self.download, SIGNAL('clicked()'), self.download_now)
         self.search.setFocus(Qt.OtherFocusReason)
         self.old_news.setValue(gconf['oldest_news'])
+        self.rnumber.setText(_('%d recipes')%self._model.rowCount(None))
         
     def download_now(self):
         recipe = self._model.data(self.recipes.currentIndex(), Qt.UserRole)
diff --git a/src/calibre/gui2/dialogs/scheduler.ui b/src/calibre/gui2/dialogs/scheduler.ui
index e265915f47..818282da89 100644
--- a/src/calibre/gui2/dialogs/scheduler.ui
+++ b/src/calibre/gui2/dialogs/scheduler.ui
@@ -30,6 +30,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="rnumber" >
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/src/calibre/gui2/dialogs/user_profiles.py b/src/calibre/gui2/dialogs/user_profiles.py
index efb34239c0..5da604c04a 100644
--- a/src/calibre/gui2/dialogs/user_profiles.py
+++ b/src/calibre/gui2/dialogs/user_profiles.py
@@ -191,7 +191,7 @@ class %(classname)s(%(base_class)s):
         
         class Recipe(object):
             def __init__(self, title, id, recipes):
-                self.title = title
+                self.title = unicode(title)
                 self.id = id
                 self.text = recipes[id]
             def __cmp__(self, other):
@@ -202,8 +202,9 @@ class %(classname)s(%(base_class)s):
         title, ok = QInputDialog.getItem(self, _('Pick recipe'), _('Pick the recipe to customize'),
                                      items, 0, False)
         if ok:
+            title = unicode(title)
             for r in recipes:
-                if r.title == unicode(title):
+                if r.title == title:
                     try:
                         self.available_profiles.add_item(title, (title, r.text), replace=False)
                     except ValueError:
@@ -228,16 +229,16 @@ class %(classname)s(%(base_class)s):
                 error_dialog(self, _('Invalid input'), 
                         _('<p>Could not create recipe. Error:<br>%s')%str(err)).exec_()
                 return
-        try:
-            self.available_profiles.add_item(title, (title, src), replace=False)
-        except ValueError:
-            d = question_dialog(self, _('Replace recipe?'), 
-                    _('A custom recipe named %s already exists. Do you want to replace it?')%title)
-            if d.exec_() == QMessageBox.Yes:
-                self.available_profiles.add_item(title, (title, src), replace=True)
-            else:
-                return
-        self.clear()
+            try:
+                self.available_profiles.add_item(title, (title, src), replace=False)
+            except ValueError:
+                d = question_dialog(self, _('Replace recipe?'), 
+                        _('A custom recipe named %s already exists. Do you want to replace it?')%title)
+                if d.exec_() == QMessageBox.Yes:
+                    self.available_profiles.add_item(title, (title, src), replace=True)
+                else:
+                    return
+            self.clear()
         
     def populate_options(self, profile):
         self.oldest_article.setValue(profile.oldest_article)
diff --git a/src/calibre/gui2/images/books_in_series.svg b/src/calibre/gui2/images/books_in_series.svg
new file mode 100644
index 0000000000..a9f39ca982
--- /dev/null
+++ b/src/calibre/gui2/images/books_in_series.svg
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<svg
+   xmlns:ns="http://ns.adobe.com/SaveForWeb/1.0/"
+   xmlns:i="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   overflow="visible"
+   enable-background="new 0 0 128 128"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="edit-copy.svg"
+   sodipodi:docbase="/home/david/sandbox"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/david/sandbox/edit-copy.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5"><defs
+   id="defs105"><linearGradient
+   id="linearGradient3291"><stop
+     style="stop-color:black;stop-opacity:1"
+     offset="0"
+     id="stop3293" /><stop
+     style="stop-color:black;stop-opacity:0"
+     offset="1"
+     id="stop3295" /></linearGradient><linearGradient
+   y2="0"
+   x2="28"
+   y1="57.5"
+   x1="28"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient18668">
+			<stop
+   id="stop18670"
+   style="stop-color:#fffccf;stop-opacity:1;"
+   offset="0" />
+			<stop
+   id="stop18672"
+   style="stop-color:white;stop-opacity:0;"
+   offset="1" />
+		</linearGradient><linearGradient
+   y2="0"
+   x2="28"
+   y1="57.5"
+   x1="28"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient15967">
+			<stop
+   id="stop15969"
+   style="stop-color:white;stop-opacity:1;"
+   offset="0" />
+			<stop
+   id="stop15971"
+   style="stop-color:white;stop-opacity:0;"
+   offset="1" />
+		</linearGradient><linearGradient
+   id="XMLID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="28"
+   y1="57.5"
+   x2="28"
+   y2="0">
+			<stop
+   offset="0"
+   style="stop-color:#FFEA00"
+   id="stop12" />
+			<stop
+   offset="1"
+   style="stop-color:#FFCC00"
+   id="stop14" />
+		</linearGradient><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_9_"
+   id="linearGradient2391"
+   gradientUnits="userSpaceOnUse"
+   x1="94.3438"
+   y1="102.3447"
+   x2="86.5356"
+   y2="94.5366" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_10_"
+   id="linearGradient2393"
+   gradientUnits="userSpaceOnUse"
+   x1="95"
+   y1="103"
+   x2="86.5865"
+   y2="94.5865" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_11_"
+   id="linearGradient2395"
+   gradientUnits="userSpaceOnUse"
+   x1="95"
+   y1="103"
+   x2="87.293"
+   y2="95.293" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_12_"
+   id="linearGradient2397"
+   gradientUnits="userSpaceOnUse"
+   x1="96"
+   y1="104"
+   x2="88.0002"
+   y2="96.0002" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_7_"
+   id="radialGradient2465"
+   gradientUnits="userSpaceOnUse"
+   cx="102"
+   cy="112.3047"
+   r="139.5585" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_8_"
+   id="radialGradient2467"
+   gradientUnits="userSpaceOnUse"
+   cx="102"
+   cy="112.3047"
+   r="139.55859" />
+	<foreignObject
+   requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+   x="0"
+   y="0"
+   width="1"
+   height="1"
+   id="foreignObject7">
+		<i:pgfRef
+   xlink:href="#adobe_illustrator_pgf">
+		</i:pgfRef>
+	</foreignObject>
+	
+<linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_2_"
+   id="linearGradient12378"
+   gradientUnits="userSpaceOnUse"
+   x1="28"
+   y1="57.5"
+   x2="28"
+   y2="0" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2309"
+   id="linearGradient14180"
+   gradientUnits="userSpaceOnUse"
+   x1="-74.820707"
+   y1="100.82378"
+   x2="-18.121965"
+   y2="100.82378" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2309"
+   id="linearGradient14189"
+   gradientUnits="userSpaceOnUse"
+   x1="-74.820707"
+   y1="100.82378"
+   x2="-18.121965"
+   y2="100.82378" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient15967"
+   id="linearGradient15973"
+   gradientUnits="userSpaceOnUse"
+   x1="27.719746"
+   y1="7.881104"
+   x2="27.719746"
+   y2="30.441185"
+   gradientTransform="translate(1.470416e-5,0)" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient2309"
+   id="linearGradient15977"
+   gradientUnits="userSpaceOnUse"
+   x1="-74.820707"
+   y1="100.82378"
+   x2="-18.121965"
+   y2="100.82378" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient15967"
+   id="radialGradient15986"
+   cx="26.954102"
+   cy="31.045055"
+   fx="26.954102"
+   fy="31.045055"
+   r="8.968153"
+   gradientTransform="matrix(0.754978,-2.959381e-2,0,0.905772,7.650275,10.87807)"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_2_"
+   id="linearGradient18657"
+   gradientUnits="userSpaceOnUse"
+   x1="28"
+   y1="57.5"
+   x2="28"
+   y2="0" />
+		<linearGradient
+   id="linearGradient18649"
+   gradientUnits="userSpaceOnUse"
+   x1="28"
+   y1="57.5"
+   x2="28"
+   y2="0">
+			<stop
+   offset="0"
+   style="stop-color:#FFEA00"
+   id="stop18651" />
+			<stop
+   offset="1"
+   style="stop-color:#FFCC00"
+   id="stop18653" />
+		</linearGradient>
+		
+	<linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient18668"
+   id="linearGradient18674"
+   gradientUnits="userSpaceOnUse"
+   x1="-39.53125"
+   y1="78"
+   x2="-39.53125"
+   y2="51.1875" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#linearGradient18668"
+   id="linearGradient18746"
+   gradientUnits="userSpaceOnUse"
+   x1="-39.53125"
+   y1="78"
+   x2="-39.53125"
+   y2="51.1875" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_8_"
+   id="radialGradient2311"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.856383,0,0,0.8415585,11.191492,18.14026)"
+   cx="99.080742"
+   cy="109.33402"
+   r="139.55859"
+   fx="99.080742"
+   fy="109.33402" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_7_"
+   id="radialGradient2314"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8749999,0,0,0.8571428,10.000003,17.142857)"
+   cx="102"
+   cy="112.3047"
+   r="139.5585" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_12_"
+   id="linearGradient2339"
+   gradientUnits="userSpaceOnUse"
+   x1="96"
+   y1="104"
+   x2="86.571632"
+   y2="94.104362"
+   gradientTransform="matrix(0.8749999,0,0,0.8571428,10.000003,17.142857)" /><filter
+   inkscape:collect="always"
+   id="filter6241"><feGaussianBlur
+     inkscape:collect="always"
+     stdDeviation="1.2065414"
+     id="feGaussianBlur6243" /></filter><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_7_"
+   id="radialGradient6272"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8749999,0,0,0.8571428,10.000003,17.142857)"
+   cx="102"
+   cy="112.3047"
+   r="139.5585" /><radialGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_8_"
+   id="radialGradient6274"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.856383,0,0,0.8415585,11.191492,18.14026)"
+   cx="99.080742"
+   cy="109.33402"
+   fx="99.080742"
+   fy="109.33402"
+   r="139.55859" /><linearGradient
+   inkscape:collect="always"
+   xlink:href="#XMLID_12_"
+   id="linearGradient6276"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.8749999,0,0,0.8571428,10.000003,17.142857)"
+   x1="96"
+   y1="104"
+   x2="86.571632"
+   y2="94.104362" /><filter
+   inkscape:collect="always"
+   id="filter3217"><feGaussianBlur
+     inkscape:collect="always"
+     stdDeviation="0.89955545"
+     id="feGaussianBlur3219" /></filter></defs><sodipodi:namedview
+   inkscape:window-height="670"
+   inkscape:window-width="1022"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="4"
+   inkscape:cx="92.02737"
+   inkscape:cy="54.798944"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:current-layer="g6245"
+   showgrid="true"
+   gridspacingx="4px"
+   gridspacingy="4px"
+   gridempspacing="0"
+   inkscape:grid-points="false"
+   inkscape:grid-bbox="true"
+   inkscape:object-points="true" />
+<metadata
+   id="metadata3">
+	<ns:sfw>
+		<ns:slices>
+			<ns:slice
+   y="0"
+   x="0"
+   height="128"
+   width="128"
+   sliceID="1316743234" />
+		</ns:slices>
+		<ns:sliceSourceBounds
+   y="0"
+   x="0"
+   height="128"
+   width="128"
+   bottomLeftOrigin="true" />
+		<ns:optimizationSettings>
+			<ns:targetSettings
+   targetSettingsID="0"
+   fileFormat="PNG24Format">
+				<ns:PNG24Format
+   transparency="true"
+   filtered="false"
+   matteColor="#FFFFFF"
+   noMatteColor="false"
+   interlaced="false">
+					</ns:PNG24Format>
+			</ns:targetSettings>
+			<ns:targetSettings
+   targetSettingsID="1696735251"
+   fileFormat="PNG24Format">
+				<ns:PNG24Format
+   transparency="true"
+   filtered="false"
+   matteColor="#FFFFFF"
+   noMatteColor="false"
+   interlaced="false">
+					</ns:PNG24Format>
+			</ns:targetSettings>
+		</ns:optimizationSettings>
+	</ns:sfw>
+<rdf:RDF><cc:Work
+     rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+       rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
+
+<radialGradient
+   id="XMLID_7_"
+   cx="102"
+   cy="112.3047"
+   r="139.5585"
+   gradientUnits="userSpaceOnUse">
+	<stop
+   offset="0"
+   style="stop-color:#00537D"
+   id="stop16" />
+	<stop
+   offset="0.0151"
+   style="stop-color:#186389"
+   id="stop18" />
+	<stop
+   offset="0.0558"
+   style="stop-color:#558CA8"
+   id="stop20" />
+	<stop
+   offset="0.0964"
+   style="stop-color:#89AFC3"
+   id="stop22" />
+	<stop
+   offset="0.1357"
+   style="stop-color:#B3CCD8"
+   id="stop24" />
+	<stop
+   offset="0.1737"
+   style="stop-color:#D4E2E9"
+   id="stop26" />
+	<stop
+   offset="0.2099"
+   style="stop-color:#ECF2F5"
+   id="stop28" />
+	<stop
+   offset="0.2435"
+   style="stop-color:#FAFCFD"
+   id="stop30" />
+	<stop
+   offset="0.2722"
+   style="stop-color:#FFFFFF"
+   id="stop32" />
+</radialGradient>
+
+<radialGradient
+   id="XMLID_8_"
+   cx="102"
+   cy="112.3047"
+   r="139.55859"
+   gradientUnits="userSpaceOnUse">
+	<stop
+   offset="0"
+   style="stop-color:#7a7d80;stop-opacity:1;"
+   id="stop37" />
+	
+	
+	
+	
+	<stop
+   offset="0.12617962"
+   style="stop-color:#c2c2c2;stop-opacity:1;"
+   id="stop47" />
+	<stop
+   offset="0.23250513"
+   style="stop-color:#FAFAFA"
+   id="stop49" />
+	<stop
+   offset="0.2722"
+   style="stop-color:#FFFFFF"
+   id="stop51" />
+	<stop
+   offset="0.5313"
+   style="stop-color:#FAFAFA"
+   id="stop53" />
+	<stop
+   offset="0.8449"
+   style="stop-color:#EBECEC"
+   id="stop55" />
+	<stop
+   offset="1"
+   style="stop-color:#E1E2E3"
+   id="stop57" />
+</radialGradient>
+
+<linearGradient
+   id="XMLID_9_"
+   gradientUnits="userSpaceOnUse"
+   x1="94.3438"
+   y1="102.3447"
+   x2="86.5356"
+   y2="94.5366">
+	<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop62" />
+	<stop
+   offset="1"
+   style="stop-color:#555753"
+   id="stop64" />
+</linearGradient>
+
+<linearGradient
+   id="XMLID_10_"
+   gradientUnits="userSpaceOnUse"
+   x1="95"
+   y1="103"
+   x2="86.5865"
+   y2="94.5865">
+	<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop69" />
+	<stop
+   offset="1"
+   style="stop-color:#555753"
+   id="stop71" />
+</linearGradient>
+
+<linearGradient
+   id="XMLID_11_"
+   gradientUnits="userSpaceOnUse"
+   x1="95"
+   y1="103"
+   x2="87.293"
+   y2="95.293">
+	<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop76" />
+	<stop
+   offset="1"
+   style="stop-color:#393B38"
+   id="stop78" />
+</linearGradient>
+
+<linearGradient
+   id="XMLID_12_"
+   gradientUnits="userSpaceOnUse"
+   x1="96"
+   y1="104"
+   x2="88.0002"
+   y2="96.0002">
+	<stop
+   offset="0"
+   style="stop-color:#888A85"
+   id="stop83" />
+	<stop
+   offset="0.0072"
+   style="stop-color:#8C8E89"
+   id="stop85" />
+	<stop
+   offset="0.0673"
+   style="stop-color:#ABACA9"
+   id="stop87" />
+	<stop
+   offset="0.1347"
+   style="stop-color:#C5C6C4"
+   id="stop89" />
+	<stop
+   offset="0.2115"
+   style="stop-color:#DBDBDA"
+   id="stop91" />
+	<stop
+   offset="0.3012"
+   style="stop-color:#EBEBEB"
+   id="stop93" />
+	<stop
+   offset="0.4122"
+   style="stop-color:#F7F7F6"
+   id="stop95" />
+	<stop
+   offset="0.5679"
+   style="stop-color:#FDFDFD"
+   id="stop97" />
+	<stop
+   offset="1"
+   style="stop-color:#FFFFFF"
+   id="stop99" />
+</linearGradient>
+<g
+   id="g6245"><g
+     id="g6263"
+     transform="translate(12,0)"
+     style="opacity:1"><path
+       sodipodi:nodetypes="cccccc"
+       id="path2350"
+       d="M 23,25 L 23,121 L 76.525498,121 C 76.989247,121 107,91.601715 107,91.147428 L 107,25 L 23,25 z "
+       style="opacity:0.6;fill:#000000;fill-opacity:1;filter:url(#filter3217)"
+       transform="matrix(1.047619,0,0,1.0416667,-2.0952381,-4.041666)" /><path
+       style="fill:url(#radialGradient6272)"
+       d="M 24.000002,24 L 24.000002,120 L 77.5255,120 C 77.989249,120 108,90.601715 108,90.147428 L 108,24 L 24.000002,24 z "
+       id="path34"
+       sodipodi:nodetypes="cccccc" /><path
+       style="fill:url(#radialGradient6274);fill-opacity:1"
+       d="M 26.606384,25.714285 C 26.134518,25.714285 25.750001,26.092145 25.750001,26.555844 L 25.750001,117.44415 C 25.750001,117.9087 26.134518,118.28572 26.606384,118.28572 L 77.280277,118.28572 C 77.505506,118.28572 77.726453,118.19652 77.885739,118.03914 L 105.99908,90.412457 C 106.15921,90.255085 106.25,90.038805 106.25,89.817475 L 106.25,26.555844 C 106.25,26.092145 105.86634,25.714285 105.39361,25.714285 L 26.606384,25.714285 z "
+       id="path59" /><path
+       d="M 76.5255,120 C 76.5255,120 88.18749,110.99999 92.99999,106.28571 C 97.81249,101.57142 107,90.147428 107,90.147428 C 107,90.147428 99,96 83,96 C 83,112 76.5255,120 76.5255,120 z "
+       id="path101"
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter6241)"
+       sodipodi:nodetypes="csccc" /><path
+       sodipodi:nodetypes="csccc"
+       style="fill:url(#linearGradient6276)"
+       id="path6233"
+       d="M 77.5255,120 C 77.5255,120 89.18749,110.99999 93.99999,106.28571 C 98.81249,101.57142 108,90.147428 108,90.147428 C 108,90.147428 100,96 84,96 C 84,112 77.5255,120 77.5255,120 z " /></g><use
+     x="0"
+     y="0"
+     xlink:href="#g6263"
+     id="use6270"
+     width="128"
+     height="128"
+     transform="translate(-28,-16)" /></g>
+
+</svg>
\ No newline at end of file
diff --git a/src/calibre/gui2/images/network-server.svg b/src/calibre/gui2/images/network-server.svg
index 80f54e090d..4adef49a37 100644
--- a/src/calibre/gui2/images/network-server.svg
+++ b/src/calibre/gui2/images/network-server.svg
@@ -2254,7 +2254,7 @@
        id="mask7160"
        maskUnits="userSpaceOnUse">
       <path
-         style="opacity:1;fill:url(#radialGradient7164);fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1"
+         style="opacity:1;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.08779998;stroke-opacity:1"
          d="M 137.37423,-51.650649 C 136.90963,-51.650649 136.53048,-51.183286 136.53048,-50.619399 L 136.53048,-0.18189907 C 141.47984,0.40821793 146.5415,0.72435094 151.68673,0.72435094 C 164.60291,0.72435094 176.96094,-1.191205 188.40548,-4.713149 L 188.40548,-50.619399 C 188.40548,-51.183286 188.02634,-51.650649 187.56173,-51.650649 L 137.37423,-51.650649 z "
          id="path7162" />
     </mask>
diff --git a/src/calibre/gui2/images/news/b92.png b/src/calibre/gui2/images/news/b92.png
new file mode 100644
index 0000000000..864c2e4e8e
Binary files /dev/null and b/src/calibre/gui2/images/news/b92.png differ
diff --git a/src/calibre/gui2/images/news/blic.png b/src/calibre/gui2/images/news/blic.png
new file mode 100644
index 0000000000..85e146b4c5
Binary files /dev/null and b/src/calibre/gui2/images/news/blic.png differ
diff --git a/src/calibre/gui2/images/news/clarin.png b/src/calibre/gui2/images/news/clarin.png
new file mode 100644
index 0000000000..f08bc3e5ac
Binary files /dev/null and b/src/calibre/gui2/images/news/clarin.png differ
diff --git a/src/calibre/gui2/images/news/danas.png b/src/calibre/gui2/images/news/danas.png
new file mode 100644
index 0000000000..8acbff1b7d
Binary files /dev/null and b/src/calibre/gui2/images/news/danas.png differ
diff --git a/src/calibre/gui2/images/news/endgadget.png b/src/calibre/gui2/images/news/endgadget.png
new file mode 100644
index 0000000000..94e8f1219c
Binary files /dev/null and b/src/calibre/gui2/images/news/endgadget.png differ
diff --git a/src/calibre/gui2/images/news/fudzilla.png b/src/calibre/gui2/images/news/fudzilla.png
new file mode 100644
index 0000000000..ad1e67335d
Binary files /dev/null and b/src/calibre/gui2/images/news/fudzilla.png differ
diff --git a/src/calibre/gui2/images/news/jutarnji.png b/src/calibre/gui2/images/news/jutarnji.png
new file mode 100644
index 0000000000..9688fef885
Binary files /dev/null and b/src/calibre/gui2/images/news/jutarnji.png differ
diff --git a/src/calibre/gui2/images/news/lanacion.png b/src/calibre/gui2/images/news/lanacion.png
new file mode 100644
index 0000000000..7ec4c32ead
Binary files /dev/null and b/src/calibre/gui2/images/news/lanacion.png differ
diff --git a/src/calibre/gui2/images/news/le_monde.png b/src/calibre/gui2/images/news/le_monde.png
new file mode 100644
index 0000000000..02ba3aba78
Binary files /dev/null and b/src/calibre/gui2/images/news/le_monde.png differ
diff --git a/src/calibre/gui2/images/news/liberation.png b/src/calibre/gui2/images/news/liberation.png
new file mode 100644
index 0000000000..e6c6d7b884
Binary files /dev/null and b/src/calibre/gui2/images/news/liberation.png differ
diff --git a/src/calibre/gui2/images/news/linux_magazine.png b/src/calibre/gui2/images/news/linux_magazine.png
new file mode 100644
index 0000000000..ef6ed8c3fe
Binary files /dev/null and b/src/calibre/gui2/images/news/linux_magazine.png differ
diff --git a/src/calibre/gui2/images/news/new_yorker.png b/src/calibre/gui2/images/news/new_yorker.png
new file mode 100644
index 0000000000..562b3b1555
Binary files /dev/null and b/src/calibre/gui2/images/news/new_yorker.png differ
diff --git a/src/calibre/gui2/images/news/newyorker.png b/src/calibre/gui2/images/news/newyorker.png
deleted file mode 100644
index a5bb5ee183..0000000000
Binary files a/src/calibre/gui2/images/news/newyorker.png and /dev/null differ
diff --git a/src/calibre/gui2/images/news/novosti.png b/src/calibre/gui2/images/news/novosti.png
new file mode 100644
index 0000000000..93eaa9d667
Binary files /dev/null and b/src/calibre/gui2/images/news/novosti.png differ
diff --git a/src/calibre/gui2/images/news/nspm.png b/src/calibre/gui2/images/news/nspm.png
new file mode 100644
index 0000000000..ff15e31325
Binary files /dev/null and b/src/calibre/gui2/images/news/nspm.png differ
diff --git a/src/calibre/gui2/images/news/nspm_int.png b/src/calibre/gui2/images/news/nspm_int.png
new file mode 100644
index 0000000000..ff15e31325
Binary files /dev/null and b/src/calibre/gui2/images/news/nspm_int.png differ
diff --git a/src/calibre/gui2/images/news/pescanik.png b/src/calibre/gui2/images/news/pescanik.png
new file mode 100644
index 0000000000..7afbcd7ba2
Binary files /dev/null and b/src/calibre/gui2/images/news/pescanik.png differ
diff --git a/src/calibre/gui2/images/news/politika.png b/src/calibre/gui2/images/news/politika.png
new file mode 100644
index 0000000000..4ac9f0f101
Binary files /dev/null and b/src/calibre/gui2/images/news/politika.png differ
diff --git a/src/calibre/gui2/images/news/sciencedaily.png b/src/calibre/gui2/images/news/sciencedaily.png
new file mode 100644
index 0000000000..ab2e1b0483
Binary files /dev/null and b/src/calibre/gui2/images/news/sciencedaily.png differ
diff --git a/src/calibre/gui2/images/news/spiegel_int.png b/src/calibre/gui2/images/news/spiegel_int.png
new file mode 100644
index 0000000000..700cdb4d33
Binary files /dev/null and b/src/calibre/gui2/images/news/spiegel_int.png differ
diff --git a/src/calibre/gui2/images/news/telegraph_uk.png b/src/calibre/gui2/images/news/telegraph_uk.png
new file mode 100644
index 0000000000..b943e57afc
Binary files /dev/null and b/src/calibre/gui2/images/news/telegraph_uk.png differ
diff --git a/src/calibre/gui2/images/news/themarketticker.png b/src/calibre/gui2/images/news/themarketticker.png
new file mode 100644
index 0000000000..488ee3c1a7
Binary files /dev/null and b/src/calibre/gui2/images/news/themarketticker.png differ
diff --git a/src/calibre/gui2/images/news/time_magazine.png b/src/calibre/gui2/images/news/time_magazine.png
new file mode 100644
index 0000000000..1939b183a6
Binary files /dev/null and b/src/calibre/gui2/images/news/time_magazine.png differ
diff --git a/src/calibre/gui2/images/news/tomshardware.png b/src/calibre/gui2/images/news/tomshardware.png
new file mode 100644
index 0000000000..c31412474c
Binary files /dev/null and b/src/calibre/gui2/images/news/tomshardware.png differ
diff --git a/src/calibre/gui2/images/news/utne.png b/src/calibre/gui2/images/news/utne.png
new file mode 100644
index 0000000000..ef422ffafd
Binary files /dev/null and b/src/calibre/gui2/images/news/utne.png differ
diff --git a/src/calibre/gui2/images/plugins.svg b/src/calibre/gui2/images/plugins.svg
new file mode 100644
index 0000000000..9444112bb5
--- /dev/null
+++ b/src/calibre/gui2/images/plugins.svg
@@ -0,0 +1,694 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="128"
+   height="128"
+   viewBox="0 0 112 112"
+   enable-background="new 0 0 112 112"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="preferences-plugin.svg.svgz"
+   sodipodi:docbase="/home/david/Desktop"
+   inkscape:output_extension="org.inkscape.output.svgz.inkscape"><metadata
+   id="metadata95"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs93"><linearGradient
+     inkscape:collect="always"
+     id="linearGradient13107"><stop
+       style="stop-color:#000000;stop-opacity:1;"
+       offset="0"
+       id="stop13109" /><stop
+       style="stop-color:#000000;stop-opacity:0;"
+       offset="1"
+       id="stop13111" /></linearGradient><linearGradient
+     id="linearGradient7263"><stop
+       style="stop-color:#ffffff;stop-opacity:0;"
+       offset="0"
+       id="stop7265" /><stop
+       style="stop-color:#ffffff;stop-opacity:0.48453608;"
+       offset="1"
+       id="stop7267" /></linearGradient><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3216"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3218"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3222"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3226"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3230"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3234"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><filter
+     inkscape:collect="always"
+     id="filter3248"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.5392541"
+       id="feGaussianBlur3250" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3304"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3306"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3310"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3314"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3318"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient3322"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><filter
+     inkscape:collect="always"
+     id="filter4299"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="0.26962705"
+       id="feGaussianBlur4301" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient4328"
+     gradientUnits="userSpaceOnUse"
+     x1="88.745003"
+     y1="55.154892"
+     x2="94.44165"
+     y2="95.81353" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient4334"
+     gradientUnits="userSpaceOnUse"
+     x1="91.39418"
+     y1="55.862"
+     x2="89.845459"
+     y2="26.322001" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient4338"
+     gradientUnits="userSpaceOnUse"
+     x1="56.799774"
+     y1="11.643"
+     x2="80.800003"
+     y2="26.163515" /><filter
+     inkscape:collect="always"
+     id="filter6290"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.24"
+       id="feGaussianBlur6292" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4344"
+     id="linearGradient9215"
+     x1="75.195961"
+     y1="-4"
+     x2="94.433243"
+     y2="113.6292"
+     gradientUnits="userSpaceOnUse" /><filter
+     inkscape:collect="always"
+     id="filter12134"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="2.4"
+       id="feGaussianBlur12136" /></filter><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient13107"
+     id="linearGradient13113"
+     x1="46.91169"
+     y1="116"
+     x2="48.325901"
+     y2="-2.5101759"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient13107"
+     id="linearGradient13161"
+     gradientUnits="userSpaceOnUse"
+     x1="46.91169"
+     y1="116"
+     x2="48.325901"
+     y2="-2.5101759" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient13107"
+     id="linearGradient13163"
+     gradientUnits="userSpaceOnUse"
+     x1="46.91169"
+     y1="116"
+     x2="48.325901"
+     y2="-2.5101759" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4344"
+     id="linearGradient13165"
+     gradientUnits="userSpaceOnUse"
+     x1="75.195961"
+     y1="-4"
+     x2="94.433243"
+     y2="113.6292" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient4344"
+     id="linearGradient13167"
+     gradientUnits="userSpaceOnUse"
+     x1="75.195961"
+     y1="-4"
+     x2="94.433243"
+     y2="113.6292" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13175"
+     gradientUnits="userSpaceOnUse"
+     x1="91.39418"
+     y1="55.862"
+     x2="89.845459"
+     y2="26.322001" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13179"
+     gradientUnits="userSpaceOnUse"
+     x1="88.745003"
+     y1="55.154892"
+     x2="94.44165"
+     y2="95.81353" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13183"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13187"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13191"
+     gradientUnits="userSpaceOnUse"
+     x1="56.799774"
+     y1="11.643"
+     x2="80.800003"
+     y2="26.163515" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13221"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="matrix(1.009217,0,0,0.9999274,-0.5151412,-5.9972184)"
+     x1="35.38496"
+     y1="13.143368"
+     x2="70.239304"
+     y2="69.509804" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#linearGradient7263"
+     id="linearGradient13223"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="35.897853"
+     x2="109.99844"
+     y2="35.897853"
+     gradientTransform="matrix(1.0092222,0,0,0.9999326,-0.5151516,-5.9975816)" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_2_"
+     id="linearGradient13243"
+     x1="62.578949"
+     y1="127.77134"
+     x2="58.966991"
+     y2="-31.68124"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13245"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13247"
+     gradientUnits="userSpaceOnUse"
+     x1="23.533312"
+     y1="107.83435"
+     x2="28.680723"
+     y2="78.514572" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13249"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13251"
+     gradientUnits="userSpaceOnUse"
+     x1="1.999"
+     y1="55.862"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13257"
+     gradientUnits="userSpaceOnUse"
+     x1="88.745003"
+     y1="55.154892"
+     x2="94.44165"
+     y2="95.81353" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13259"
+     gradientUnits="userSpaceOnUse"
+     x1="63.870842"
+     y1="86.705002"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13265"
+     gradientUnits="userSpaceOnUse"
+     x1="56.799774"
+     y1="11.643"
+     x2="80.800003"
+     y2="26.163515" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13267"
+     gradientUnits="userSpaceOnUse"
+     x1="45.839619"
+     y1="18.38534"
+     x2="109.998"
+     y2="55.862" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13269"
+     gradientUnits="userSpaceOnUse"
+     x1="91.39418"
+     y1="55.862"
+     x2="89.845459"
+     y2="26.322001" /><linearGradient
+     inkscape:collect="always"
+     xlink:href="#SVGID_9_"
+     id="linearGradient13271"
+     gradientUnits="userSpaceOnUse"
+     x1="63.870842"
+     y1="21.023001"
+     x2="109.998"
+     y2="55.862" /><filter
+     inkscape:collect="always"
+     id="filter18426"><feGaussianBlur
+       inkscape:collect="always"
+       stdDeviation="1.12"
+       id="feGaussianBlur18428" /></filter></defs><sodipodi:namedview
+   inkscape:window-height="713"
+   inkscape:window-width="1024"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   width="128px"
+   height="128px"
+   inkscape:zoom="2.8284271"
+   inkscape:cx="56"
+   inkscape:cy="62.542861"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:current-layer="g3266" />
+
+<linearGradient
+   id="SVGID_2_"
+   gradientUnits="userSpaceOnUse"
+   x1="55.998501"
+   y1="122.1953"
+   x2="55.998501"
+   y2="-27.688801">
+	<stop
+   offset="0"
+   style="stop-color:#00892C"
+   id="stop13" />
+	<stop
+   offset="0.0791"
+   style="stop-color:#259E34"
+   id="stop15" />
+	<stop
+   offset="0.1681"
+   style="stop-color:#48B23B"
+   id="stop17" />
+	<stop
+   offset="0.2522"
+   style="stop-color:#61C041"
+   id="stop19" />
+	<stop
+   offset="0.3286"
+   style="stop-color:#71C944"
+   id="stop21" />
+	<stop
+   offset="0.3901"
+   style="stop-color:#71d73a;stop-opacity:1;"
+   id="stop23" />
+	<stop
+   offset="1"
+   style="stop-color:#00892C"
+   id="stop25" />
+</linearGradient>
+
+
+<linearGradient
+   id="SVGID_8_"
+   gradientUnits="userSpaceOnUse"
+   x1="65.537102"
+   y1="106.5479"
+   x2="65.537102"
+   y2="2.0360999">
+	<stop
+   offset="0"
+   style="stop-color:#F8FFBF"
+   id="stop77" />
+	<stop
+   offset="0.4"
+   style="stop-color:#FFFFFF"
+   id="stop79" />
+	<stop
+   offset="1"
+   style="stop-color:#F8FFBF"
+   id="stop81" />
+</linearGradient>
+
+<linearGradient
+   id="SVGID_9_"
+   gradientUnits="userSpaceOnUse"
+   x1="29.021"
+   y1="6.0723"
+   x2="70.239304"
+   y2="69.509804">
+	<stop
+   offset="0"
+   style="stop-color:#FFFFFF"
+   id="stop86" />
+	<stop
+   offset="1"
+   style="stop-color:#ffffff;stop-opacity:0;"
+   id="stop88" />
+</linearGradient>
+<g
+   id="g3266"
+   transform="matrix(0.875,0,0,0.875,6.9999998,7)"><g
+     style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:url(#linearGradient13161);stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter12134)"
+     id="g11155"
+     transform="translate(0,-2)">
+	<linearGradient
+   style="stroke:url(#linearGradient13113)"
+   y2="144.4818"
+   x2="126.7421"
+   y1="5.7275"
+   x1="19.7563"
+   gradientUnits="userSpaceOnUse"
+   id="linearGradient11157">
+		<stop
+   id="stop11159"
+   style="stop-color:#64ba32;stop-opacity:1;stroke:url(#linearGradient13113)"
+   offset="0" />
+		<stop
+   id="stop11161"
+   style="stop-color:#00892C;stroke:url(#linearGradient13113)"
+   offset="1" />
+	</linearGradient>
+	<path
+   id="path11163"
+   d="M 63.718,0 C 71.232,0 78.445,0.652 82,6 C 85.555,11.348 75.978,14.839 78.645,19.459 C 85.19,22.815 101.277,22.06 112,22 C 112,22 112,53.03 112,53.376 C 106.208,56.712 100.089,51.931 95,51 C 85.395,55.274 85.348,78.515 95,82.68 C 100.722,83.13 100.419,77.649 107,78.96 C 112.013,85.694 112,112 112,112 L 22,112 C 22,112 22.422,83.565 19.538,80.682 C 16.654,77.799 14.483,85.954 7.26,84.41 C 2.943,82.345 0,78.605 0,68 C 0,57.395 2.812,52.71 7.068,50.316 C 13.635,48.93 14.699,57.379 18.178,53.9 C 21.657,50.421 22.07,34.826 22,22 C 32.448,22 45.674,24 52,19 C 52.428,13.665 48.199,13.695 48,9 C 49.149,2.904 56.22,0.222 63.718,0 z "
+   clip-rule="evenodd"
+   style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient13163);stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</g><g
+     id="g4342"
+     style="fill:none;stroke:url(#linearGradient13165);stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     transform="translate(0,-4)">
+	<linearGradient
+   id="linearGradient4344"
+   gradientUnits="userSpaceOnUse"
+   x1="19.7563"
+   y1="5.7275"
+   x2="126.7421"
+   y2="144.4818"
+   style="stroke:url(#linearGradient9215)">
+		<stop
+   offset="0"
+   style="stop-color:#64ba32;stop-opacity:1;"
+   id="stop4346" />
+		<stop
+   offset="1"
+   style="stop-color:#00892C;stroke:url(#linearGradient9215)"
+   id="stop4348" />
+	</linearGradient>
+	<path
+   style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient13167);stroke-width:8;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+   clip-rule="evenodd"
+   d="M 63.718,0 C 71.232,0 78.445,0.652 82,6 C 85.555,11.348 75.978,14.839 78.645,19.459 C 85.19,22.815 101.277,22.06 112,22 C 112,22 112,53.03 112,53.376 C 106.208,56.712 100.089,51.931 95,51 C 85.395,55.274 85.348,78.515 95,82.68 C 100.722,83.13 100.419,77.649 107,78.96 C 112.013,85.694 112,112 112,112 L 22,112 C 22,112 22.422,83.565 19.538,80.682 C 16.654,77.799 14.483,85.954 7.26,84.41 C 2.943,82.345 0,78.605 0,68 C 0,57.395 2.812,52.71 7.068,50.316 C 13.635,48.93 14.699,57.379 18.178,53.9 C 21.657,50.421 22.07,34.826 22,22 C 32.448,22 45.674,24 52,19 C 52.428,13.665 48.199,13.695 48,9 C 49.149,2.904 56.22,0.222 63.718,0 z "
+   id="path4350" />
+</g><g
+     id="g3"
+     style="filter:url(#filter18426);fill:url(#linearGradient13243)"
+     transform="translate(0,-4)">
+	<linearGradient
+   y2="144.4818"
+   x2="126.7421"
+   y1="5.7275"
+   x1="19.7563"
+   gradientUnits="userSpaceOnUse"
+   id="SVGID_1_"
+   style="fill:url(#linearGradient13243)">
+		<stop
+   id="stop6"
+   style="stop-color:#76CC45;fill:url(#linearGradient13243)"
+   offset="0" />
+		<stop
+   id="stop8"
+   style="stop-color:#00892C;fill:url(#linearGradient13243)"
+   offset="1" />
+	</linearGradient>
+	<path
+   id="path10"
+   d="M 63.718,0 C 71.232,0 78.445,0.652 82,6 C 85.555,11.348 75.978,14.839 78.645,19.459 C 85.19,22.815 101.277,22.06 112,22 C 112,22 112,53.03 112,53.376 C 106.208,56.712 100.089,51.931 95,51 C 85.395,55.274 85.348,78.515 95,82.68 C 100.722,83.13 100.419,77.649 107,78.96 C 112.013,85.694 112,112 112,112 L 22,112 C 22,112 22.422,83.565 19.538,80.682 C 16.654,77.799 14.483,85.954 7.26,84.41 C 2.943,82.345 0,78.605 0,68 C 0,57.395 2.812,52.71 7.068,50.316 C 13.635,48.93 14.699,57.379 18.178,53.9 C 21.657,50.421 22.07,34.826 22,22 C 32.448,22 45.674,24 52,19 C 52.428,13.665 48.199,13.695 48,9 C 49.149,2.904 56.22,0.222 63.718,0 z "
+   clip-rule="evenodd"
+   style="fill:url(#linearGradient13243);fill-rule:evenodd" />
+</g><path
+     id="path90"
+     d="M 108.47928,18.045036 C 108.47121,18.045036 108.46414,18.045036 108.45708,18.045036 L 107.81521,18.053036 C 105.52429,18.084034 103.11328,18.115032 100.68005,18.115032 C 88.864141,18.115032 81.849073,17.229095 77.934321,15.239241 L 77.4065,14.96926 L 77.107772,14.460297 C 75.306319,11.364522 76.910974,8.8507039 79.038404,6.1039029 C 80.439197,4.2960347 80.948851,3.5030919 81.02858,2.6521537 C 81.049773,2.4281699 81.030598,2.2031862 80.9761,1.9852021 C 80.907474,1.7072222 80.767192,1.4132435 80.562321,1.1072657 C 77.722385,-3.1224273 71.824521,-3.994364 63.779044,-3.9963639 C 61.025899,-3.9093702 51.906615,-3.1664241 50.081951,2.6851512 C 49.984057,3.0041281 49.964882,3.3441034 50.03149,3.6710797 C 50.244435,4.7130036 50.809597,5.3829555 51.522103,6.2298944 C 52.749312,7.6837885 54.27222,9.4956574 53.977528,13.160391 L 53.908902,14.028328 L 53.217588,14.569289 C 48.912269,17.942044 42.37557,18.396011 36.548351,18.396011 C 34.030355,18.396011 31.426576,18.294019 28.850044,18.195025 C 27.809541,18.154029 26.791242,18.114032 25.799182,18.081034 C 25.77597,18.081034 25.753767,18.079034 25.730555,18.079034 C 25.209799,18.079034 24.708218,18.28002 24.330771,18.637994 C 23.937176,19.012966 23.716157,19.528929 23.71212,20.06889 C 23.599089,42.061294 21.398995,47.195921 19.260464,49.316767 C 18.284552,50.279697 17.279372,50.747663 16.18639,50.747663 C 14.451546,50.747663 13.214247,49.531751 12.11319,48.44883 L 11.91942,48.260844 L 11.54702,47.90087 C 10.410641,46.825948 9.4296827,46.161996 8.0591661,46.161996 C 7.658507,46.161996 7.2174791,46.281987 6.8824192,46.503971 C 3.2118971,48.951793 1.5022835,53.875437 1.5022835,61.997847 C 1.5022835,62.619802 1.5133849,63.212759 1.5345785,63.780717 C 31.217668,64.093694 70.03518,58.029135 110.49772,33.866889 L 110.49772,20.045892 C 110.49772,19.51193 110.28275,18.999967 109.89824,18.622995 C 109.5218,18.254021 109.01013,18.045036 108.47928,18.045036 z "
+     clip-rule="evenodd"
+     style="fill:url(#linearGradient13221);fill-rule:evenodd;stroke:url(#linearGradient13223);stroke-width:1.00456667" /><g
+     id="g31"
+     style="fill:url(#linearGradient13269);filter:url(#filter4299)"
+     transform="translate(0,-6)">
+		<linearGradient
+   id="SVGID_3_"
+   gradientUnits="userSpaceOnUse"
+   x1="73.623001"
+   y1="23.672899"
+   x2="118.9906"
+   y2="23.672899"
+   style="fill:url(#linearGradient3216)">
+			<stop
+   offset="0"
+   style="stop-color:#FFFFFF;fill:url(#linearGradient3216)"
+   id="stop34" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;fill:url(#linearGradient3216)"
+   id="stop36" />
+		</linearGradient>
+		<path
+   clip-rule="evenodd"
+   d="M 77.314,21.023 C 77.438,21.49 77.628,21.966 77.913,22.46 L 78.209,22.969 L 78.732,23.239 C 82.611,25.229 89.562,26.115 101.27,26.115 C 103.681,26.115 106.071,26.084 108.34,26.053 L 108.976,26.045 C 108.984,26.045 108.991,26.045 108.998,26.045 C 109.353,26.045 109.696,26.147 109.998,26.322 L 109.998,26.045 C 109.998,25.511 109.785,24.999 109.404,24.622 C 109.031,24.253 108.524,24.044 107.998,24.044 C 107.99,24.044 107.983,24.044 107.976,24.044 L 107.34,24.052 C 105.07,24.083 102.681,24.114 100.27,24.114 C 88.562,24.114 81.611,23.228 77.732,21.238 L 77.314,21.023 z "
+   id="path38"
+   style="fill:url(#linearGradient13271);fill-rule:evenodd" />
+	</g><g
+     id="g40"
+     style="fill:url(#linearGradient13257);filter:url(#filter4299)"
+     transform="translate(2,-6)">
+		<linearGradient
+   id="SVGID_4_"
+   gradientUnits="userSpaceOnUse"
+   x1="86.693398"
+   y1="83.060501"
+   x2="111.9058"
+   y2="83.060501"
+   style="fill:url(#linearGradient3216)">
+			<stop
+   offset="0"
+   style="stop-color:#FFFFFF;fill:url(#linearGradient3216)"
+   id="stop43" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;fill:url(#linearGradient3216)"
+   id="stop45" />
+		</linearGradient>
+		<path
+   clip-rule="evenodd"
+   d="M 95.208,86.515 L 95.513,86.648 L 95.842,86.672 C 96.125,86.694 96.395,86.705 96.652,86.705 C 99.594,86.705 101.274,85.371 102.622,84.301 C 103.601,83.521 104.245,83.038 105.18,82.843 C 105.317,82.815 105.451,82.802 105.585,82.802 C 106.084,82.802 106.547,83.005 106.91,83.332 C 106.755,82.863 106.595,82.417 106.426,82.02 C 106.108,81.27 105.374,80.802 104.585,80.802 C 104.451,80.802 104.316,80.815 104.18,80.843 C 103.245,81.038 102.602,81.521 101.622,82.301 C 100.274,83.371 98.595,84.705 95.652,84.705 C 95.395,84.705 95.126,84.694 94.842,84.672 L 94.513,84.648 L 94.208,84.515 C 91.836,83.493 90.052,81.66 88.745,79.415 C 90.08,82.559 92.163,85.202 95.208,86.515 z "
+   id="path47"
+   style="fill:url(#linearGradient13259);fill-rule:evenodd" />
+	</g><g
+     id="g49"
+     style="fill:url(#linearGradient13249);filter:url(#filter4299)"
+     transform="translate(0,-6)">
+		<linearGradient
+   id="SVGID_5_"
+   gradientUnits="userSpaceOnUse"
+   x1="-3.9907"
+   y1="47.521"
+   x2="69.618896"
+   y2="47.521"
+   style="fill:url(#linearGradient3216)">
+			<stop
+   offset="0"
+   style="stop-color:#FFFFFF;fill:url(#linearGradient3216)"
+   id="stop52" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;fill:url(#linearGradient3216)"
+   id="stop54" />
+		</linearGradient>
+		<path
+   clip-rule="evenodd"
+   d="M 2.999,70 C 2.999,61.877 4.693,56.953 8.327,54.503 C 8.659,54.281 9.096,54.161 9.493,54.161 C 10.851,54.161 11.823,54.826 12.949,55.9 L 13.318,56.26 L 13.51,56.448 C 14.601,57.531 15.827,58.747 17.546,58.747 C 18.629,58.747 19.625,58.278 20.592,57.315 C 22.711,55.195 24.891,50.06 25.003,28.066 C 25.007,27.526 25.227,27.01 25.616,26.635 C 25.991,26.277 26.488,26.076 27.003,26.076 C 27.026,26.076 27.048,26.078 27.071,26.078 C 28.054,26.111 29.063,26.151 30.094,26.192 C 32.647,26.292 35.227,26.393 37.722,26.393 C 43.495,26.393 49.972,25.939 54.239,22.566 L 54.924,22.025 L 54.992,21.157 C 55.2,18.538 54.487,16.873 53.62,15.601 C 53.936,16.562 54.107,17.711 53.992,19.157 L 53.924,20.025 L 53.239,20.566 C 48.973,23.939 42.496,24.393 36.722,24.393 C 34.227,24.393 31.647,24.291 29.094,24.192 C 28.063,24.151 27.054,24.111 26.071,24.078 C 26.048,24.078 26.026,24.076 26.003,24.076 C 25.487,24.076 24.99,24.277 24.616,24.635 C 24.226,25.01 24.007,25.526 24.003,26.066 C 23.891,48.06 21.711,53.195 19.592,55.316 C 18.625,56.279 17.629,56.747 16.546,56.747 C 14.827,56.747 13.601,55.531 12.51,54.448 L 12.318,54.26 L 11.949,53.9 C 10.823,52.825 9.851,52.161 8.493,52.161 C 8.096,52.161 7.659,52.281 7.327,52.503 C 3.693,54.953 1.999,59.877 1.999,68 C 1.999,73.927 2.971,77.338 4.329,79.438 C 3.52,77.321 2.999,74.334 2.999,70 z "
+   id="path56"
+   style="fill:url(#linearGradient13251);fill-rule:evenodd" />
+	</g><g
+     id="g58"
+     style="fill:url(#linearGradient13245);filter:url(#filter4299)"
+     transform="translate(-2,-4)">
+		<linearGradient
+   id="SVGID_6_"
+   gradientUnits="userSpaceOnUse"
+   x1="21.6807"
+   y1="95.531197"
+   x2="25.875299"
+   y2="95.531197"
+   style="fill:url(#linearGradient3216)">
+			<stop
+   offset="0"
+   style="stop-color:#FFFFFF;fill:url(#linearGradient3216)"
+   id="stop61" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;fill:url(#linearGradient3216)"
+   id="stop63" />
+		</linearGradient>
+		<path
+   clip-rule="evenodd"
+   d="M 22.022,81.343 C 23.062,84.495 24.117,91.695 24.041,107.991 C 24.039,108.52 24.248,109.032 24.623,109.409 C 24.748,109.534 24.892,109.634 25.042,109.721 C 25.125,88.172 23.22,82.671 22.022,81.343 z "
+   id="path65"
+   style="fill:url(#linearGradient13247);fill-rule:evenodd" />
+	</g><g
+     id="g67"
+     style="fill:url(#linearGradient13265);filter:url(#filter4299)"
+     transform="translate(0,-6)">
+		<linearGradient
+   id="SVGID_7_"
+   gradientUnits="userSpaceOnUse"
+   x1="46.571301"
+   y1="6.8223"
+   x2="89.260399"
+   y2="6.8223"
+   style="fill:url(#linearGradient3216)">
+			<stop
+   offset="0"
+   style="stop-color:#FFFFFF;fill:url(#linearGradient3216)"
+   id="stop70" />
+			<stop
+   offset="1"
+   style="stop-color:#000000;fill:url(#linearGradient3216)"
+   id="stop72" />
+		</linearGradient>
+		<path
+   clip-rule="evenodd"
+   d="M 51.082,11.643 C 51.022,11.324 51.039,10.995 51.134,10.684 C 52.942,4.832 61.979,4.089 64.706,4.002 C 72.203,4.004 77.816,4.776 80.8,8.387 C 80.794,8.252 80.779,8.116 80.746,7.985 C 80.678,7.707 80.539,7.413 80.336,7.107 C 77.522,2.877 71.678,2.005 63.706,2.003 C 60.978,2.09 51.942,2.833 50.134,8.685 C 50.037,9.004 50.018,9.344 50.084,9.671 C 50.245,10.461 50.607,11.04 51.082,11.643 z "
+   id="path74"
+   style="fill:url(#linearGradient13267);fill-rule:evenodd" />
+	</g></g>
+</svg>
\ No newline at end of file
diff --git a/src/calibre/gui2/jobs2.py b/src/calibre/gui2/jobs2.py
index a0b7063c79..10b3853907 100644
--- a/src/calibre/gui2/jobs2.py
+++ b/src/calibre/gui2/jobs2.py
@@ -128,10 +128,20 @@ class JobManager(QAbstractTableModel):
         self.emit(SIGNAL('layoutChanged()'))
     
     def _status_update(self, job):
-        row = self.jobs.index(job)
+        try:
+            row = self.jobs.index(job)
+        except ValueError: # Job has been stopped
+            return
         self.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'),
                   self.index(row, 0), self.index(row, 3))
         
+    def running_time_updated(self):
+        for job in self.jobs:
+            if not job.is_running:
+                continue
+            row = self.jobs.index(job)
+            self.emit(SIGNAL('dataChanged(QModelIndex, QModelIndex)'),
+                      self.index(row, 3), self.index(row, 3))
             
     def has_device_jobs(self):
         for job in self.jobs:
@@ -188,6 +198,6 @@ class DetailView(QDialog, Ui_Dialog):
         
             
     def update(self):
-        self.log.setPlainText(self.job.gui_text())
+        self.log.setPlainText(self.job.console_text())
         vbar = self.log.verticalScrollBar()
         vbar.setValue(vbar.maximum())
diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 45c8031510..3129fec47a 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -8,14 +8,15 @@ from math import cos, sin, pi
 from PyQt4.QtGui import QTableView, QAbstractItemView, QColor, \
                         QItemDelegate, QPainterPath, QLinearGradient, QBrush, \
                         QPen, QStyle, QPainter, QLineEdit, \
-                        QPalette, QImage, QApplication, QMenu
+                        QPalette, QImage, QApplication, QMenu, QStyledItemDelegate
 from PyQt4.QtCore import QAbstractTableModel, QVariant, Qt, QString, \
-                         SIGNAL, QObject, QSize, QModelIndex
+                         SIGNAL, QObject, QSize, QModelIndex, QDate
 
 from calibre import strftime
 from calibre.ptempfile import PersistentTemporaryFile
 from calibre.library.database2 import FIELD_MAP
-from calibre.gui2 import NONE, TableView, qstring_to_unicode, config
+from calibre.gui2 import NONE, TableView, qstring_to_unicode, config, \
+                         error_dialog
 from calibre.utils.search_query_parser import SearchQueryParser
 
 class LibraryDelegate(QItemDelegate):
@@ -81,6 +82,17 @@ class LibraryDelegate(QItemDelegate):
         sb.setMaximum(5)
         return sb
 
+class DateDelegate(QStyledItemDelegate):
+    
+    def displayText(self, val, locale):
+        d = val.toDate()
+        return d.toString('dd MMM yyyy')
+        if d.isNull():
+            return ''
+        d = datetime(d.year(), d.month(), d.day())
+        return strftime(BooksView.TIME_FMT, d.timetuple())
+        
+
 class BooksModel(QAbstractTableModel):
     coding = zip(
     [1000,900,500,400,100,90,50,40,10,9,5,4,1],
@@ -113,7 +125,8 @@ class BooksModel(QAbstractTableModel):
         QAbstractTableModel.__init__(self, parent)
         self.db = None
         self.column_map = config['column_map']
-        self.editable_cols = ['title', 'authors', 'rating', 'publisher', 'tags', 'series']
+        self.editable_cols = ['title', 'authors', 'rating', 'publisher', 
+                              'tags', 'series', 'timestamp']
         self.default_image = QImage(':/images/book.svg')
         self.sorted_on = ('timestamp', Qt.AscendingOrder)
         self.last_search = '' # The last search performed on this model
@@ -135,7 +148,12 @@ class BooksModel(QAbstractTableModel):
                 idx = self.column_map.index('rating')
             except ValueError:
                 idx = -1
-            self.emit(SIGNAL('columns_sorted(int)'), idx)
+            try:
+                tidx = self.column_map.index('timestamp')
+            except ValueError:
+                tidx = -1
+            
+            self.emit(SIGNAL('columns_sorted(int,int)'), idx, tidx)
         
     
     def set_database(self, db):
@@ -163,11 +181,18 @@ class BooksModel(QAbstractTableModel):
         self.reset()
 
     def add_books(self, paths, formats, metadata, uris=[], add_duplicates=False):
-        return self.db.add_books(paths, formats, metadata, uris,
+        ret = self.db.add_books(paths, formats, metadata, uris,
                                  add_duplicates=add_duplicates)
+        self.count_changed()
+        return ret
         
     def add_news(self, path, recipe):
-        return self.db.add_news(path, recipe)
+        ret = self.db.add_news(path, recipe)
+        self.count_changed()
+        return ret
+    
+    def count_changed(self, *args):
+        self.emit(SIGNAL('count_changed(int)'), self.db.count())
 
     def row_indices(self, index):
         ''' Return list indices of all cells in index.row()'''
@@ -189,9 +214,11 @@ class BooksModel(QAbstractTableModel):
             self.beginRemoveRows(QModelIndex(), row, row)
             self.db.delete_book(id)
             self.endRemoveRows()
+        self.count_changed()
         self.clear_caches()
         self.reset()
         
+        
     def delete_books_by_id(self, ids):
         for id in ids:
             try:
@@ -203,12 +230,14 @@ class BooksModel(QAbstractTableModel):
             self.db.delete_book(id)
             if row > -1:
                 self.endRemoveRows()
+        self.count_changed()
         self.clear_caches()
 
     def books_added(self, num):
         if num > 0:
             self.beginInsertRows(QModelIndex(), 0, num-1)
             self.endInsertRows()
+        self.count_changed()
 
     def search(self, text, refinement, reset=True):
         self.db.search(text)
@@ -431,7 +460,7 @@ class BooksModel(QAbstractTableModel):
             dt = self.db.data[r][tmdx]
             if dt:
                 dt = dt - timedelta(seconds=time.timezone) + timedelta(hours=time.daylight)
-                return strftime(BooksView.TIME_FMT, dt.timetuple())
+                return QDate(dt.year, dt.month, dt.day)
         
         def rating(r):
             r = self.db.data[r][ridx]
@@ -473,8 +502,8 @@ class BooksModel(QAbstractTableModel):
         if role in (Qt.DisplayRole, Qt.EditRole):
             ans = self.dc[self.column_map[index.column()]](index.row())
             return NONE if ans is None else QVariant(ans)
-        elif role == Qt.TextAlignmentRole and self.column_map[index.column()] in ('size', 'timestamp'):
-            return QVariant(Qt.AlignCenter | Qt.AlignVCenter)
+        #elif role == Qt.TextAlignmentRole and self.column_map[index.column()] in ('size', 'timestamp'):
+        #    return QVariant(Qt.AlignVCenter | Qt.AlignCenter)
         #elif role == Qt.ToolTipRole and index.isValid():
         #    if self.column_map[index.column()] in self.editable_cols:
         #        return QVariant(_("Double click to <b>edit</b> me<br><br>"))
@@ -496,35 +525,40 @@ class BooksModel(QAbstractTableModel):
         return flags
 
     def setData(self, index, value, role):
-        done = False
         if role == Qt.EditRole:
             row, col = index.row(), index.column()
             column = self.column_map[col]
             if column not in self.editable_cols:
                 return False
-            val = unicode(value.toString().toUtf8(), 'utf-8').strip() if column != 'rating' else \
-                  int(value.toInt()[0])
+            val = int(value.toInt()[0]) if column == 'rating' else \
+                  value.toDate() if column == 'timestamp' else \
+                  unicode(value.toString())
+            id = self.db.id(row)  
             if column == 'rating':
                 val = 0 if val < 0 else 5 if val > 5 else val
                 val *= 2
-            if column == 'series':
+            elif column == 'series':
                 pat = re.compile(r'\[(\d+)\]')
                 match = pat.search(val)
-                id = self.db.id(row)
                 if match is not None:
                     self.db.set_series_index(id, int(match.group(1)))
                     val = pat.sub('', val)
                 val = val.strip()
                 if val:
                     self.db.set_series(id, val)
+            elif column == 'timestamp':
+                if val.isNull() or not val.isValid():
+                    return False
+                dt = datetime(val.year(), val.month(), val.day()) + timedelta(seconds=time.timezone) - timedelta(hours=time.daylight)
+                self.db.set_timestamp(id, dt)
             else:
                 self.db.set(row, column, val)
             self.emit(SIGNAL("dataChanged(QModelIndex, QModelIndex)"), \
                                 index, index)
             if column == self.sorted_on[0]:
                 self.resort()
-            done = True
-        return done
+            
+        return True
 
 class BooksView(TableView):
     TIME_FMT = '%d %b %Y'
@@ -543,27 +577,32 @@ class BooksView(TableView):
     def __init__(self, parent, modelcls=BooksModel):
         TableView.__init__(self, parent)
         self.rating_delegate = LibraryDelegate(self)
+        self.timestamp_delegate = DateDelegate(self)
         self.display_parent = parent
         self._model = modelcls(self)
         self.setModel(self._model)
         self.setSelectionBehavior(QAbstractItemView.SelectRows)
         self.setSortingEnabled(True)
         try:
-            self.columns_sorted(self._model.column_map.index('rating'))
+            self.columns_sorted(self._model.column_map.index('rating'),
+                                self._model.column_map.index('timestamp'))
         except ValueError:
             pass
         QObject.connect(self.selectionModel(), SIGNAL('currentRowChanged(QModelIndex, QModelIndex)'),
                         self._model.current_changed)
-        self.connect(self._model, SIGNAL('columns_sorted(int)'), self.columns_sorted, Qt.QueuedConnection)
+        self.connect(self._model, SIGNAL('columns_sorted(int, int)'), self.columns_sorted, Qt.QueuedConnection)
         
-    def columns_sorted(self, col):
+    def columns_sorted(self, rating_col, timestamp_col):
         for i in range(self.model().columnCount(None)):
             if self.itemDelegateForColumn(i) == self.rating_delegate:
                 self.setItemDelegateForColumn(i, self.itemDelegate())
-        if col > -1:
-            self.setItemDelegateForColumn(col, self.rating_delegate)
+        if rating_col > -1:
+            self.setItemDelegateForColumn(rating_col, self.rating_delegate)
+        if timestamp_col > -1:
+            self.setItemDelegateForColumn(timestamp_col, self.timestamp_delegate)
             
-    def set_context_menu(self, edit_metadata, send_to_device, convert, view, save, open_folder):
+    def set_context_menu(self, edit_metadata, send_to_device, convert, view, 
+                         save, open_folder, book_details, similar_menu=None):
         self.setContextMenuPolicy(Qt.DefaultContextMenu)
         self.context_menu = QMenu(self)
         if edit_metadata is not None:
@@ -576,6 +615,10 @@ class BooksView(TableView):
         self.context_menu.addAction(save)
         if open_folder is not None:
             self.context_menu.addAction(open_folder)
+        if book_details is not None:
+            self.context_menu.addAction(book_details)
+        if similar_menu is not None:
+            self.context_menu.addMenu(similar_menu)
         
     def contextMenuEvent(self, event):
         self.context_menu.popup(event.globalPos())
@@ -641,6 +684,8 @@ class DeviceBooksView(BooksView):
         self.rating_delegate = None
         for i in range(10):
             self.setItemDelegateForColumn(i, self.itemDelegate())
+        self.setDragDropMode(self.NoDragDrop)
+        self.setAcceptDrops(False)
 
     def resizeColumnsToContents(self):
         QTableView.resizeColumnsToContents(self)
@@ -651,6 +696,10 @@ class DeviceBooksView(BooksView):
         
     def sortByColumn(self, col, order):
         TableView.sortByColumn(self, col, order)
+        
+    def dropEvent(self, *args):
+        error_dialog(self, _('Not allowed'), 
+        _('Dropping onto a device is not supported. First add the book to the calibre library.')).exec_()
 
 class OnDeviceSearch(SearchQueryParser):
     
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 261e25aa5c..279dab42aa 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -3,10 +3,11 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import os, sys, textwrap, collections, traceback, time
 from xml.parsers.expat import ExpatError
 from functools import partial
-from PyQt4.QtCore import Qt, SIGNAL, QObject, QCoreApplication, QUrl, QTimer
-from PyQt4.QtGui import QPixmap, QColor, QPainter, QMenu, QIcon, QMessageBox, \
-                        QToolButton, QDialog, QDesktopServices, QFileDialog, \
-                        QSystemTrayIcon, QApplication, QKeySequence, QAction
+from PyQt4.Qt import Qt, SIGNAL, QObject, QCoreApplication, QUrl, QTimer, \
+                     QModelIndex, QPixmap, QColor, QPainter, QMenu, QIcon, \
+                     QToolButton, QDialog, QDesktopServices, QFileDialog, \
+                     QSystemTrayIcon, QApplication, QKeySequence, QAction, \
+                     QProgressDialog, QMessageBox, QStackedLayout
 from PyQt4.QtSvg import QSvgRenderer
 
 from calibre import __version__, __appname__, islinux, sanitize_file_name, \
@@ -21,7 +22,8 @@ from calibre.gui2 import APP_UID, warning_dialog, choose_files, error_dialog, \
                            pixmap_to_data, choose_dir, ORG_NAME, \
                            set_sidebar_directories, Dispatcher, \
                            SingleApplication, Application, available_height, \
-                           max_available_height, config, info_dialog, import_format
+                           max_available_height, config, info_dialog, \
+                           available_width
 from calibre.gui2.cover_flow import CoverFlow, DatabaseImages, pictureflowerror
 from calibre.library.database import LibraryDatabase
 from calibre.gui2.dialogs.scheduler import Scheduler
@@ -48,6 +50,7 @@ from calibre.library.database2 import LibraryDatabase2, CoverCache
 from calibre.parallel import JobKilled
 from calibre.utils.filenames import ascii_filename
 from calibre.gui2.widgets import WarningDialog
+from calibre.gui2.dialogs.confirm_delete import confirm
 
 class Main(MainWindow, Ui_MainWindow):
 
@@ -99,24 +102,48 @@ class Main(MainWindow, Ui_MainWindow):
         self.donate_action  = self.system_tray_menu.addAction(QIcon(':/images/donate.svg'), _('&Donate'))
         self.quit_action    = QAction(QIcon(':/images/window-close.svg'), _('&Quit'), self)
         self.addAction(self.quit_action)
+        self.action_restart = QAction(_('&Restart'), self)
+        self.addAction(self.action_restart)
         self.system_tray_menu.addAction(self.quit_action)
         self.quit_action.setShortcut(QKeySequence(Qt.CTRL + Qt.Key_Q))
+        self.action_restart.setShortcut(QKeySequence(Qt.CTRL + Qt.Key_R))
+        self.action_show_book_details.setShortcut(QKeySequence(Qt.Key_I))
+        self.addAction(self.action_show_book_details)
         self.system_tray_icon.setContextMenu(self.system_tray_menu)
         self.connect(self.quit_action, SIGNAL('triggered(bool)'), self.quit)
         self.connect(self.donate_action, SIGNAL('triggered(bool)'), self.donate)
         self.connect(self.restore_action, SIGNAL('triggered(bool)'), lambda c : self.show())
+        self.connect(self.action_show_book_details, SIGNAL('triggered(bool)'), self.show_book_info)
+        def restart_app(c):
+            self.quit(None, restart=True)
+        self.connect(self.action_restart, SIGNAL('triggered(bool)'), restart_app)
         def sta(r):
             if r == QSystemTrayIcon.Trigger:
                 self.hide() if self.isVisible() else self.show()
         self.connect(self.system_tray_icon, SIGNAL('activated(QSystemTrayIcon::ActivationReason)'), sta)
         def tcme(self, *args):
-            print args
+            pass
         self.tool_bar.contextMenuEvent = tcme
         ####################### Location View ########################
         QObject.connect(self.location_view, SIGNAL('location_selected(PyQt_PyObject)'),
                         self.location_selected)
         QObject.connect(self.stack, SIGNAL('currentChanged(int)'),
                         self.location_view.location_changed)
+        
+        self.output_formats = sorted(['EPUB', 'LRF'])
+        for f in self.output_formats:
+            self.output_format.addItem(f)
+        self.output_format.setCurrentIndex(self.output_formats.index(prefs['output_format']))
+        def change_output_format(x):
+            of = unicode(x).strip()
+            if of != prefs['output_format']:
+                if of in ('EPUB', 'LIT'):
+                    warning_dialog(self, 'Warning', 
+                                   '<p>%s support is still in beta. If you find bugs, please report them by opening a <a href="http://calibre.kovidgoyal.net">ticket</a>.'%of).exec_()
+                prefs.set('output_format', of)
+        
+        self.connect(self.output_format, SIGNAL('currentIndexChanged(QString)'), 
+                     change_output_format)
 
         ####################### Vanity ########################
         self.vanity_template  = _('<p>For help visit <a href="http://%s.kovidgoyal.net/user_manual">%s.kovidgoyal.net</a><br>')%(__appname__, __appname__)
@@ -162,8 +189,8 @@ class Main(MainWindow, Ui_MainWindow):
         self.metadata_menu = md
         self.add_menu = QMenu()
         self.add_menu.addAction(_('Add books from a single directory'))
-        self.add_menu.addAction(_('Add books recursively (One book per directory, assumes every ebook file is the same book in a different format)'))
-        self.add_menu.addAction(_('Add books recursively (Multiple books per directory, assumes every ebook file is a different book)'))
+        self.add_menu.addAction(_('Add books from directories, including sub-directories (One book per directory, assumes every ebook file is the same book in a different format)'))
+        self.add_menu.addAction(_('Add books from directories, including sub directories (Multiple books per directory, assumes every ebook file is a different book)'))
         self.action_add.setMenu(self.add_menu)
         QObject.connect(self.action_add, SIGNAL("triggered(bool)"), self.add_books)
         QObject.connect(self.add_menu.actions()[0], SIGNAL("triggered(bool)"), self.add_books)
@@ -172,7 +199,7 @@ class Main(MainWindow, Ui_MainWindow):
         QObject.connect(self.action_del, SIGNAL("triggered(bool)"), self.delete_books)
         QObject.connect(self.action_edit, SIGNAL("triggered(bool)"), self.edit_metadata)
         QObject.connect(md.actions()[0], SIGNAL('triggered(bool)'), partial(self.edit_metadata, bulk=False))
-        QObject.connect(md.actions()[1], SIGNAL('triggered(bool)'), self.edit_bulk_metadata)
+        QObject.connect(md.actions()[2], SIGNAL('triggered(bool)'), partial(self.edit_metadata, bulk=True))
         QObject.connect(sm.actions()[0], SIGNAL('triggered(bool)'), self.sync_to_main_memory)
         QObject.connect(sm.actions()[1], SIGNAL('triggered(bool)'), self.sync_to_card)
         QObject.connect(sm.actions()[2], SIGNAL('triggered(bool)'), partial(self.sync_to_main_memory, delete_from_library=True))
@@ -195,6 +222,7 @@ class Main(MainWindow, Ui_MainWindow):
         QObject.connect(self.view_menu.actions()[1], SIGNAL("triggered(bool)"), self.view_specific_format)
         self.connect(self.action_open_containing_folder, SIGNAL('triggered(bool)'), self.view_folder)
         self.action_open_containing_folder.setShortcut(Qt.Key_O)
+        self.addAction(self.action_open_containing_folder)
         self.action_sync.setShortcut(Qt.Key_D)
         self.action_sync.setMenu(sm)
         self.action_edit.setMenu(md)
@@ -225,11 +253,35 @@ class Main(MainWindow, Ui_MainWindow):
         QObject.connect(self.advanced_search_button, SIGNAL('clicked(bool)'), self.do_advanced_search)
         
         ####################### Library view ########################
+        similar_menu = QMenu(_('Similar books...'))
+        similar_menu.addAction(self.action_books_by_same_author)
+        similar_menu.addAction(self.action_books_in_this_series)
+        similar_menu.addAction(self.action_books_with_the_same_tags)
+        similar_menu.addAction(self.action_books_by_this_publisher)
+        self.action_books_by_same_author.setShortcut(Qt.ALT + Qt.Key_A)
+        self.action_books_in_this_series.setShortcut(Qt.ALT + Qt.Key_S)
+        self.action_books_by_this_publisher.setShortcut(Qt.ALT + Qt.Key_P)
+        self.action_books_with_the_same_tags.setShortcut(Qt.ALT+Qt.Key_T)
+        self.addAction(self.action_books_by_same_author)
+        self.addAction(self.action_books_by_this_publisher)
+        self.addAction(self.action_books_in_this_series)
+        self.addAction(self.action_books_with_the_same_tags)
+        self.similar_menu = similar_menu
+        self.connect(self.action_books_by_same_author, SIGNAL('triggered()'),
+                     lambda : self.show_similar_books('author'))
+        self.connect(self.action_books_in_this_series, SIGNAL('triggered()'),
+                     lambda : self.show_similar_books('series'))
+        self.connect(self.action_books_with_the_same_tags, SIGNAL('triggered()'),
+                     lambda : self.show_similar_books('tag'))
+        self.connect(self.action_books_by_this_publisher, SIGNAL('triggered()'),
+                     lambda : self.show_similar_books('publisher'))
         self.library_view.set_context_menu(self.action_edit, self.action_sync, 
                                            self.action_convert, self.action_view, 
-                                           self.action_save, self.action_open_containing_folder)
-        self.memory_view.set_context_menu(None, None, None, self.action_view, self.action_save, None)
-        self.card_view.set_context_menu(None, None, None, self.action_view, self.action_save, None)
+                                           self.action_save, self.action_open_containing_folder,
+                                           self.action_show_book_details,
+                                           similar_menu=similar_menu)
+        self.memory_view.set_context_menu(None, None, None, self.action_view, self.action_save, None, None)
+        self.card_view.set_context_menu(None, None, None, self.action_view, self.action_save, None, None)
         QObject.connect(self.library_view, SIGNAL('files_dropped(PyQt_PyObject)'),
                         self.files_dropped)
         for func, target in [
@@ -248,7 +300,7 @@ class Main(MainWindow, Ui_MainWindow):
             db = LibraryDatabase2(self.library_path)
         except OSError, err:
             error_dialog(self, _('Bad database location'), unicode(err)).exec_()
-            dir = unicode(QFileDialog.getExistingDirectory(self, 
+            dir = unicode(QFileDialog.getExistingDirectory(self,
                             _('Choose a location for your ebook library.'), os.path.expanduser('~')))
             if not dir:
                 QCoreApplication.exit(1)
@@ -257,7 +309,6 @@ class Main(MainWindow, Ui_MainWindow):
                 db = LibraryDatabase2(self.library_path)
         self.library_view.set_database(db)
         if self.olddb is not None:
-            from PyQt4.QtGui import QProgressDialog
             pd = QProgressDialog('', '', 0, 100, self)
             pd.setWindowModality(Qt.ApplicationModal)
             pd.setCancelButton(None)
@@ -287,12 +338,21 @@ class Main(MainWindow, Ui_MainWindow):
         self.connect(self.status_bar.tag_view_button, SIGNAL('toggled(bool)'), self.toggle_tags_view)
         self.connect(self.search, SIGNAL('search(PyQt_PyObject, PyQt_PyObject)'),
                      self.tags_view.model().reinit)
+        self.connect(self.library_view.model(), SIGNAL('count_changed(int)'), self.location_view.count_changed)
+        self.library_view.model().count_changed()
         ########################### Cover Flow ################################
         self.cover_flow = None
         if CoverFlow is not None:
-            self.cover_flow = CoverFlow(height=220 if available_height() > 950 else 170 if available_height() > 850 else 140)
+            text_height = 40 if config['separate_cover_flow'] else 25
+            ah = available_height()
+            cfh = ah-100
+            cfh = 3./5 * cfh - text_height
+            if not config['separate_cover_flow']:
+                cfh = 220 if ah > 950 else 170 if ah > 850 else 140
+            self.cover_flow = CoverFlow(height=cfh, text_height=text_height)
             self.cover_flow.setVisible(False)
-            self.library.layout().addWidget(self.cover_flow)
+            if not config['separate_cover_flow']:
+                self.library.layout().addWidget(self.cover_flow)
             self.connect(self.cover_flow, SIGNAL('currentChanged(int)'), self.sync_cf_to_listview)
             self.connect(self.cover_flow, SIGNAL('itemActivated(int)'), self.show_book_info)
             self.connect(self.status_bar.cover_flow_button, SIGNAL('toggled(bool)'), self.toggle_cover_flow)
@@ -322,25 +382,76 @@ class Main(MainWindow, Ui_MainWindow):
         self.scheduler = Scheduler(self)
         self.action_news.setMenu(self.scheduler.news_menu)
         self.connect(self.action_news, SIGNAL('triggered(bool)'), self.scheduler.show_dialog)
-        
+        self.location_view.setCurrentIndex(self.location_view.model().index(0))
         
     def test_server(self, *args):
         if self.content_server.exception is not None:
             error_dialog(self, _('Failed to start content server'), 
                          unicode(self.content_server.exception)).exec_()
 
+    def show_similar_books(self, type):
+        search, join = [], ' '
+        idx = self.library_view.currentIndex()
+        if not idx.isValid():
+            return
+        row = idx.row()
+        if type == 'series':
+            series = idx.model().db.series(row)
+            if series:
+                search = ['series:'+series]
+        elif type == 'publisher':
+            publisher = idx.model().db.publisher(row)
+            if publisher:
+                search = ['publisher:'+publisher]
+        elif type == 'tag':
+            tags = idx.model().db.tags(row)
+            if tags:
+                search = ['tag:'+t for t in tags.split(',')]
+        elif type == 'author':
+            authors = idx.model().db.authors(row)
+            if authors:
+                search = ['author:'+a.strip().replace('|', ',') for a in authors.split(',')]
+                join = ' or '
+        if search:
+            self.search.set_search_string(join.join(search))
+            
+                
+    
     def toggle_cover_flow(self, show):
-        if show:
-            self.library_view.setCurrentIndex(self.library_view.currentIndex())
-            self.cover_flow.setVisible(True)
-            self.cover_flow.setFocus(Qt.OtherFocusReason)
-            self.status_bar.book_info.book_data.setMaximumHeight(100)
-            self.status_bar.setMaximumHeight(120)
-            self.library_view.scrollTo(self.library_view.currentIndex())
+        if config['separate_cover_flow']:
+            if show:
+                d = QDialog(self)
+                ah, aw = available_height(), available_width()
+                d.resize(int(aw/2.), ah-60)
+                d._layout = QStackedLayout()
+                d.setLayout(d._layout)
+                d.setWindowTitle(_('Browse by covers'))
+                d.layout().addWidget(self.cover_flow)
+                self.cover_flow.setVisible(True)
+                self.cover_flow.setFocus(Qt.OtherFocusReason)
+                self.library_view.scrollTo(self.library_view.currentIndex())
+                d.show()
+                self.connect(d, SIGNAL('finished(int)'), 
+                             lambda x: self.status_bar.cover_flow_button.setChecked(False))
+                self.cf_dialog = d
+            else:
+                cfd = getattr(self, 'cf_dialog', None)
+                if cfd is not None:
+                    self.cover_flow.setVisible(False)
+                    cfd.hide()
+                    self.cf_dialog = None
         else:
-            self.cover_flow.setVisible(False)
-            self.status_bar.book_info.book_data.setMaximumHeight(1000)
-        self.setMaximumHeight(available_height())
+            if show:
+                self.library_view.setCurrentIndex(self.library_view.currentIndex())
+                self.cover_flow.setVisible(True)
+                self.cover_flow.setFocus(Qt.OtherFocusReason)
+                #self.status_bar.book_info.book_data.setMaximumHeight(100)
+                #self.status_bar.setMaximumHeight(120)
+                self.library_view.scrollTo(self.library_view.currentIndex())
+            else:
+                self.cover_flow.setVisible(False)
+                #self.status_bar.book_info.book_data.setMaximumHeight(1000)
+            self.setMaximumHeight(available_height())
 
     def toggle_tags_view(self, show):
         if show:
@@ -426,7 +537,7 @@ class Main(MainWindow, Ui_MainWindow):
             return
         info, cp, fs = job.result
         self.location_view.model().update_devices(cp, fs)
-        self.device_info = _('Connected ')+' '.join(info[:-1])
+        self.device_info = _('Connected ')+info[0]
         self.vanity.setText(self.vanity_template%dict(version=self.latest_version, device=self.device_info))
 
         self.device_manager.books(Dispatcher(self.metadata_downloaded))
@@ -487,8 +598,24 @@ class Main(MainWindow, Ui_MainWindow):
         root = choose_dir(self, 'recursive book import root dir dialog', 'Select root folder')
         if not root:
             return
-        duplicates = self.library_view.model().db.recursive_import(root, single)
-
+        progress = QProgressDialog('', '&'+_('Stop'),
+                                   0, 0, self)
+        progress.setWindowModality(Qt.ApplicationModal)
+        progress.setWindowTitle(_('Adding books recursively...'))
+        progress.show()
+        def callback(msg):
+            if msg != '.':
+                progress.setLabelText((_('Added ')+msg) if msg else _('Searching...'))
+            stop =  progress.wasCanceled()
+            QApplication.processEvents()
+            QApplication.sendPostedEvents()
+            QApplication.flush()
+            return stop
+        try:
+            duplicates = self.library_view.model().db.recursive_import(root, single, callback=callback)
+        finally:
+            progress.hide()
+            progress.close()            
         if duplicates:
             files = _('<p>Books with the same title as the following already exist in the database. Add them anyway?<ul>')
             for mi, formats in duplicates:
@@ -555,49 +682,61 @@ class Main(MainWindow, Ui_MainWindow):
     def _add_books(self, paths, to_device, on_card=None):
         if on_card is None:
             on_card = self.stack.currentIndex() == 2
+        if not paths:
+            return
         # Get format and metadata information
         formats, metadata, names, infos = [], [], [], []
-        for book in paths:
-            format = os.path.splitext(book)[1]
-            format = format[1:] if format else None
-            stream = open(book, 'rb')
-            try:
-                mi = get_metadata(stream, stream_type=format, use_libprs_metadata=True)
-            except:
-                mi = MetaInformation(None, None)
-            if not mi.title:
-                mi.title = os.path.splitext(os.path.basename(book))[0]
-            if not mi.authors:
-                mi.authors = [_('Unknown')]
-            formats.append(format)
-            metadata.append(mi)
-            names.append(os.path.basename(book))
-            infos.append({'title':mi.title, 'authors':', '.join(mi.authors),
-                          'cover':self.default_thumbnail, 'tags':[]})
-
-        if not to_device:
-            model = self.library_view.model()
+        progress = QProgressDialog(_('Reading metadata...'), _('Stop'), 0, len(paths), self)
+        progress.setWindowTitle(_('Adding books...'))
+        progress.setWindowModality(Qt.ApplicationModal)
+        progress.setLabelText(_('Reading metadata...'))
+        progress.show()
+        try:
+            for c, book in enumerate(paths):
+                progress.setValue(c)
+                if progress.wasCanceled():
+                    return
+                format = os.path.splitext(book)[1]
+                format = format[1:] if format else None
+                stream = open(book, 'rb')
+                try:
+                    mi = get_metadata(stream, stream_type=format, use_libprs_metadata=True)
+                except:
+                    mi = MetaInformation(None, None)
+                if not mi.title:
+                    mi.title = os.path.splitext(os.path.basename(book))[0]
+                if not mi.authors:
+                    mi.authors = [_('Unknown')]
+                formats.append(format)
+                metadata.append(mi)
+                names.append(os.path.basename(book))
+                infos.append({'title':mi.title, 'authors':', '.join(mi.authors),
+                              'cover':self.default_thumbnail, 'tags':[]})
+                title = mi.title if isinstance(mi.title, unicode) else mi.title.decode(preferred_encoding, 'replace')
+                progress.setLabelText(_('Read metadata from ')+title)
             
-            paths = list(paths)
-            for i, path in enumerate(paths):
-                npath, fmt = import_format(path)
-                if npath is not None:
-                    paths[i] = npath
-                    formats[i] = fmt
-            duplicates, number_added = model.add_books(paths, formats, metadata)
-            if duplicates:
-                files = _('<p>Books with the same title as the following already exist in the database. Add them anyway?<ul>')
-                for mi in duplicates[2]:
-                    files += '<li>'+mi.title+'</li>\n'
-                d = WarningDialog(_('Duplicates found!'), _('Duplicates found!'), files+'</ul></p>', parent=self)
-                if d.exec_() == QDialog.Accepted:
-                    num = model.add_books(*duplicates, **dict(add_duplicates=True))[1]
-                    number_added += num
-            #self.library_view.sortByColumn(3, Qt.DescendingOrder)
-            #model.research()
-            model.books_added(number_added)
-        else:
-            self.upload_books(paths, list(map(sanitize_file_name, names)), infos, on_card=on_card)
+            if not to_device:
+                progress.setLabelText(_('Adding books to database...'))
+                model = self.library_view.model()
+                
+                paths = list(paths)
+                duplicates, number_added = model.add_books(paths, formats, metadata)
+                progress.cancel()
+                if duplicates:
+                    files = _('<p>Books with the same title as the following already exist in the database. Add them anyway?<ul>')
+                    for mi in duplicates[2]:
+                        files += '<li>'+mi.title+'</li>\n'
+                    d = WarningDialog(_('Duplicates found!'), _('Duplicates found!'), files+'</ul></p>', parent=self)
+                    if d.exec_() == QDialog.Accepted:
+                        num = model.add_books(*duplicates, **dict(add_duplicates=True))[1]
+                        number_added += num
+                model.books_added(number_added)
+            else:
+                self.upload_books(paths, list(map(sanitize_file_name, names)), infos, on_card=on_card)
+        finally:
+            progress.setValue(progress.maximum())
+            progress.hide()
+            progress.close()
 
     def upload_books(self, files, names, metadata, on_card=False, memory=None):
         '''
@@ -609,13 +748,13 @@ class Main(MainWindow, Ui_MainWindow):
                                         files, names, on_card=on_card,
                                         titles=titles
                                         )
-        self.upload_memory[job] = (metadata, on_card, memory)
+        self.upload_memory[job] = (metadata, on_card, memory, files)
     
     def books_uploaded(self, job):
         '''
         Called once books have been uploaded.
         '''
-        metadata, on_card, memory = self.upload_memory.pop(job)
+        metadata, on_card, memory, files = self.upload_memory.pop(job)
         
         if job.exception is not None:
             if isinstance(job.exception, FreeSpaceError):
@@ -636,6 +775,8 @@ class Main(MainWindow, Ui_MainWindow):
         view = self.card_view if on_card else self.memory_view
         view.model().resort(reset=False)
         view.model().research()
+        for f in files:
+            getattr(f, 'close', lambda : True)()
         if memory and memory[1]:
             self.library_view.model().delete_books_by_id(memory[1])
 
@@ -651,13 +792,9 @@ class Main(MainWindow, Ui_MainWindow):
         rows = view.selectionModel().selectedRows()
         if not rows or len(rows) == 0:
             return
-        if config['confirm_delete']:
-            d = question_dialog(self, _('Confirm delete'), 
-                            _('Are you sure you want to delete these %d books?')%len(rows))
-            if d.exec_() != QMessageBox.Yes:
-                return
-            
         if self.stack.currentIndex() == 0:
+            if not confirm('<p>'+_('The selected books will be <b>permanently deleted</b> and the files removed from your computer. Are you sure?')+'</p>', 'library_delete_books', self):
+                return
             view.model().delete_books(rows)
         else:
             view = self.memory_view if self.stack.currentIndex() == 1 else self.card_view
@@ -694,6 +831,7 @@ class Main(MainWindow, Ui_MainWindow):
         Edit metadata of selected books in library.
         '''
         rows = self.library_view.selectionModel().selectedRows()
+        previous = self.library_view.currentIndex()
         if not rows or len(rows) == 0:
             d = error_dialog(self, _('Cannot edit metadata'), _('No books selected'))
             d.exec_()
@@ -710,7 +848,10 @@ class Main(MainWindow, Ui_MainWindow):
                                     self.library_view.model().db,
                                     accepted_callback=accepted)
             d.exec_()
-
+        if rows:
+            current = self.library_view.currentIndex()
+            self.library_view.model().current_changed(current, previous)
+            
     def edit_bulk_metadata(self, checked):
         '''
         Edit metadata of selected books in library in bulk.
@@ -745,6 +886,7 @@ class Main(MainWindow, Ui_MainWindow):
     def sync_news(self):
         if self.device_connected:
             ids = list(dynamic.get('news_to_be_synced', set([])))
+            ids = [id for id in ids if self.library_view.model().db.has_id(id)]
             files = [self.library_view.model().db.format(id, prefs['output_format'], index_is_id=True, as_file=True) for id in ids]
             files = [f for f in files if f is not None]
             metadata = self.library_view.model().get_metadata(ids, rows_are_ids=True)
@@ -879,6 +1021,7 @@ class Main(MainWindow, Ui_MainWindow):
             self.job_exception(job)
             return
         id = self.library_view.model().add_news(pt.name, recipe)
+        self.library_view.model().reset()
         sync = dynamic.get('news_to_be_synced', set([]))
         sync.add(id)
         dynamic.set('news_to_be_synced', sync)
@@ -937,6 +1080,8 @@ class Main(MainWindow, Ui_MainWindow):
     def convert_single(self, checked):
         r = self.get_books_for_conversion()
         if r is None: return
+        previous = self.library_view.currentIndex()
+        rows = [x.row() for x in self.library_view.selectionModel().selectedRows()]
         comics, others = r
         jobs, changed = convert_single_ebook(self, self.library_view.model().db, comics, others)
         for func, args, desc, fmt, id, temp_files in jobs:
@@ -945,8 +1090,9 @@ class Main(MainWindow, Ui_MainWindow):
             self.conversion_jobs[job] = (temp_files, fmt, id)
             
         if changed:
-            self.library_view.model().resort(reset=False)
-            self.library_view.model().research()
+            self.library_view.model().refresh_rows(rows)
+            current = self.library_view.currentIndex()
+            self.library_view.model().current_changed(current, previous)
                     
     def book_converted(self, job):
         temp_files, fmt, book_id = self.conversion_jobs.pop(job)
@@ -965,6 +1111,9 @@ class Main(MainWindow, Ui_MainWindow):
                         os.remove(f.name)
                 except:
                     pass
+        if self.current_view() is self.library_view:
+            current = self.library_view.currentIndex()
+            self.library_view.model().current_changed(current, QModelIndex())
     
     #############################View book######################################
 
@@ -1097,7 +1246,6 @@ class Main(MainWindow, Ui_MainWindow):
                     newloc = d.database_location
                     if not os.path.exists(os.path.join(newloc, 'metadata.db')):
                         if os.access(self.library_path, os.R_OK):
-                            from PyQt4.QtGui import QProgressDialog
                             pd = QProgressDialog('', '', 0, 100, self)
                             pd.setWindowModality(Qt.ApplicationModal)
                             pd.setCancelButton(None)
@@ -1275,8 +1423,9 @@ in which you want to store your books files. Any existing books will be automati
         if self.device_connected:
             self.memory_view.write_settings()
     
-    def quit(self, checked):
+    def quit(self, checked, restart=False):
         if self.shutdown():
+            self.restart_after_quit = restart
             QApplication.instance().quit()
             
     def donate(self):
@@ -1411,7 +1560,13 @@ def main(args=sys.argv):
         sys.excepthook = main.unhandled_exception
         if len(args) > 1:
             main.add_filesystem_book(args[1])
-        return app.exec_()
+        ret = app.exec_()
+        if getattr(main, 'restart_after_quit', False):
+            e = sys.executable if getattr(sys, 'froze', False) else sys.argv[0] 
+            print 'Restarting with:', e, sys.argv
+            os.execvp(e, sys.argv)
+        else:
+            return ret
     return 0
 
 
diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index 200e54c38f..2733a61be3 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -27,15 +27,9 @@
     <normaloff>:/library</normaloff>:/library</iconset>
   </property>
   <widget class="QWidget" name="centralwidget" >
-   <layout class="QGridLayout" >
+   <layout class="QGridLayout" name="gridLayout" >
     <item row="0" column="0" >
-     <layout class="QHBoxLayout" >
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <property name="margin" >
-       <number>0</number>
-      </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3" >
       <item>
        <widget class="LocationView" name="location_view" >
         <property name="sizePolicy" >
@@ -46,8 +40,8 @@
         </property>
         <property name="maximumSize" >
          <size>
-          <width>10000</width>
-          <height>110</height>
+          <width>16777215</width>
+          <height>100</height>
          </size>
         </property>
         <property name="verticalScrollBarPolicy" >
@@ -74,41 +68,62 @@
         <property name="flow" >
          <enum>QListView::LeftToRight</enum>
         </property>
-        <property name="isWrapping" stdset="0" >
-         <bool>false</bool>
-        </property>
-        <property name="spacing" >
-         <number>10</number>
+        <property name="gridSize" >
+         <size>
+          <width>175</width>
+          <height>90</height>
+         </size>
         </property>
         <property name="viewMode" >
-         <enum>QListView::IconMode</enum>
+         <enum>QListView::ListMode</enum>
+        </property>
+        <property name="wordWrap" >
+         <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="vanity" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="maximumSize" >
-         <size>
-          <width>16777215</width>
-          <height>90</height>
-         </size>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="textFormat" >
-         <enum>Qt::RichText</enum>
-        </property>
-        <property name="openExternalLinks" >
-         <bool>true</bool>
-        </property>
-       </widget>
+       <layout class="QVBoxLayout" name="verticalLayout_3" >
+        <item>
+         <widget class="QLabel" name="vanity" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize" >
+           <size>
+            <width>16777215</width>
+            <height>90</height>
+           </size>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="textFormat" >
+           <enum>Qt::RichText</enum>
+          </property>
+          <property name="openExternalLinks" >
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <layout class="QHBoxLayout" name="horizontalLayout_2" >
+          <item>
+           <widget class="QLabel" name="label_2" >
+            <property name="text" >
+             <string>Output:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QComboBox" name="output_format" />
+          </item>
+         </layout>
+        </item>
+       </layout>
       </item>
      </layout>
     </item>
@@ -569,6 +584,51 @@
     <string>Open containing folder</string>
    </property>
   </action>
+  <action name="action_show_book_details" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
+     <normaloff>:/images/dialog_information.svg</normaloff>:/images/dialog_information.svg</iconset>
+   </property>
+   <property name="text" >
+    <string>Show book details</string>
+   </property>
+  </action>
+  <action name="action_books_by_same_author" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
+     <normaloff>:/images/user_profile.svg</normaloff>:/images/user_profile.svg</iconset>
+   </property>
+   <property name="text" >
+    <string>Books by same author</string>
+   </property>
+  </action>
+  <action name="action_books_in_this_series" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
+     <normaloff>:/images/books_in_series.svg</normaloff>:/images/books_in_series.svg</iconset>
+   </property>
+   <property name="text" >
+    <string>Books in this series</string>
+   </property>
+  </action>
+  <action name="action_books_by_this_publisher" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
+     <normaloff>:/images/publisher.png</normaloff>:/images/publisher.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Books by this publisher</string>
+   </property>
+  </action>
+  <action name="action_books_with_the_same_tags" >
+   <property name="icon" >
+    <iconset resource="images.qrc" >
+     <normaloff>:/images/tags.svg</normaloff>:/images/tags.svg</iconset>
+   </property>
+   <property name="text" >
+    <string>Books with the same tags</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/calibre/gui2/pictureflow/pictureflow.cpp b/src/calibre/gui2/pictureflow/pictureflow.cpp
index a6b28146e9..3d2b0286c0 100644
--- a/src/calibre/gui2/pictureflow/pictureflow.cpp
+++ b/src/calibre/gui2/pictureflow/pictureflow.cpp
@@ -715,7 +715,7 @@ void PictureFlowPrivate::render()
     painter.setPen(Qt::white);
     //painter.setPen(QColor(255,255,255,127));
 
-    if (centerIndex < slideCount() and centerIndex > -1) 
+    if (centerIndex < slideCount() && centerIndex > -1) 
     	painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
                       Qt::AlignCenter, slideImages->caption(centerIndex));
 
@@ -767,12 +767,12 @@ void PictureFlowPrivate::render()
     int sc = slideCount();
 
     painter.setPen(QColor(255,255,255, (255-fade) ));
-    if (leftTextIndex < sc and leftTextIndex > -1)
+    if (leftTextIndex < sc && leftTextIndex > -1)
     	painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
                       Qt::AlignCenter, slideImages->caption(leftTextIndex));
 
     painter.setPen(QColor(255,255,255, fade));
-    if (leftTextIndex+1 < sc and leftTextIndex > -2)
+    if (leftTextIndex+1 < sc && leftTextIndex > -2)
     	painter.drawText( QRect(0,0, buffer.width(), (buffer.height() - slideSize().height())/2),
                       Qt::AlignCenter, slideImages->caption(leftTextIndex+1));
 
diff --git a/src/calibre/gui2/status.py b/src/calibre/gui2/status.py
index d6321fbf43..75a967943e 100644
--- a/src/calibre/gui2/status.py
+++ b/src/calibre/gui2/status.py
@@ -2,16 +2,18 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 import re, collections
 
-from PyQt4.QtGui import QStatusBar, QMovie, QLabel, QFrame, QHBoxLayout, QPixmap, \
-                        QVBoxLayout, QSizePolicy, QToolButton, QIcon
+from PyQt4.QtGui import QStatusBar, QMovie, QLabel, QWidget, QHBoxLayout, QPixmap, \
+                        QVBoxLayout, QSizePolicy, QToolButton, QIcon, QScrollArea, QFrame
 from PyQt4.QtCore import Qt, QSize, SIGNAL, QCoreApplication
-from calibre import fit_image, preferred_encoding
+from calibre import fit_image, preferred_encoding, isosx
 from calibre.gui2 import qstring_to_unicode
 
-class BookInfoDisplay(QFrame):
+class BookInfoDisplay(QWidget):
     class BookCoverDisplay(QLabel):
-        WIDTH = 80
-        HEIGHT = 100
+        
+        WIDTH = 81
+        HEIGHT = 108
+        
         def __init__(self, coverpath=':/images/book.svg'):
             QLabel.__init__(self)
             self.default_pixmap = QPixmap(coverpath).scaled(self.__class__.WIDTH,
@@ -19,6 +21,7 @@ class BookInfoDisplay(QFrame):
                                                             Qt.IgnoreAspectRatio,
                                                             Qt.SmoothTransformation)
             self.setScaledContents(True)
+            self.setMaximumHeight(self.HEIGHT)
             self.setPixmap(self.default_pixmap)
             
         
@@ -29,7 +32,10 @@ class BookInfoDisplay(QFrame):
             self.setMaximumWidth(width)
             QLabel.setPixmap(self, pixmap)
              
-            aspect_ratio = pixmap.width()/float(pixmap.height())
+            try:
+                aspect_ratio = pixmap.width()/float(pixmap.height())
+            except ZeroDivisionError:
+                aspect_ratio = 1
             self.setMaximumWidth(int(aspect_ratio*self.HEIGHT))
         
         def sizeHint(self):
@@ -39,11 +45,9 @@ class BookInfoDisplay(QFrame):
     class BookDataDisplay(QLabel):
         def __init__(self):
             QLabel.__init__(self)
-            #self.setTextInteractionFlags(Qt.TextSelectableByMouse)
             self.setText('')
             self.setWordWrap(True)
-            self.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum))
-            self.setMaximumHeight(100)
+            self.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
             
         def mouseReleaseEvent(self, ev):
             self.emit(SIGNAL('mr(int)'), 1)
@@ -56,18 +60,20 @@ class BookInfoDisplay(QFrame):
     WEIGHTS[_('Tags')] = 4
     
     def __init__(self, clear_message):
-        QFrame.__init__(self)
+        QWidget.__init__(self)
         self.setCursor(Qt.PointingHandCursor)
+        self.setSizePolicy(QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding))
+        self._layout = QHBoxLayout()
+        self.setLayout(self._layout)
         self.clear_message = clear_message
-        self.layout = QHBoxLayout()
-        self.setLayout(self.layout)
         self.cover_display = BookInfoDisplay.BookCoverDisplay()
-        self.layout.addWidget(self.cover_display)
+        self._layout.addWidget(self.cover_display)
         self.book_data = BookInfoDisplay.BookDataDisplay()
         self.connect(self.book_data, SIGNAL('mr(int)'), self.mouseReleaseEvent)
-        self.layout.addWidget(self.book_data)
+        self._layout.addWidget(self.book_data)
         self.data = {}
         self.setVisible(False)
+        self._layout.setAlignment(self.cover_display, Qt.AlignTop|Qt.AlignLeft)
         
     def mouseReleaseEvent(self, ev):
         self.emit(SIGNAL('show_book_info()'))
@@ -85,7 +91,6 @@ class BookInfoDisplay(QFrame):
         keys.sort(cmp=lambda x, y: cmp(self.WEIGHTS[x], self.WEIGHTS[y]))
         for key in keys:
             txt = data[key]
-            #txt = '<br />\n'.join(textwrap.wrap(txt, 120))
             if isinstance(key, str):
                 key = key.decode(preferred_encoding, 'replace')
             if isinstance(txt, str):
@@ -94,6 +99,8 @@ class BookInfoDisplay(QFrame):
         self.book_data.setText(u'<table>'+rows+u'</table>')
         
         self.clear_message()
+        self.book_data.updateGeometry()
+        self.updateGeometry()
         self.setVisible(True)
 
 class MovieButton(QFrame):
@@ -164,6 +171,7 @@ class TagViewButton(QToolButton):
     
 
 class StatusBar(QStatusBar):
+    
     def __init__(self, jobs_dialog, systray=None):
         QStatusBar.__init__(self)
         self.systray = systray
@@ -174,17 +182,29 @@ class StatusBar(QStatusBar):
         self.addPermanentWidget(self.tag_view_button)
         self.addPermanentWidget(self.movie_button)
         self.book_info = BookInfoDisplay(self.clearMessage)
+        self.scroll_area = QScrollArea()
+        self.scroll_area.setWidget(self.book_info)
+        self.scroll_area.setMaximumHeight(120)
+        self.scroll_area.setWidgetResizable(True)
         self.connect(self.book_info, SIGNAL('show_book_info()'), self.show_book_info)
-        self.addWidget(self.book_info)
+        self.addWidget(self.scroll_area, 100)
         self.setMinimumHeight(120)
+        self.setMaximumHeight(120)
+        
     
     def reset_info(self):
         self.book_info.show_data({})
         
     def showMessage(self, msg, timeout=0):
+        ret = QStatusBar.showMessage(self, msg, timeout)
         if self.systray is not None:
+            if isosx and isinstance(msg, unicode):
+                try:
+                    msg = msg.encode(preferred_encoding)
+                except UnicodeEncodeError:
+                    msg = msg.encode('utf-8')
             self.systray.showMessage('calibre', msg, self.systray.Information, 10000)
-        return QStatusBar.showMessage(self, msg, timeout)
+        return ret
     
     def jobs(self):
         src = qstring_to_unicode(self.movie_button.jobs.text())
diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index da8120c910..6c1eca0061 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -512,11 +512,22 @@ class DocumentView(QWebView):
         
     def wheelEvent(self, event):
         if event.delta() < -14:
-            self.next_page()
+            if self.document.at_bottom:
+                if self.manager is not None:
+                    self.manager.next_document()
+                    event.accept()
+                    return
         elif event.delta() > 14:
-            self.previous_page()
-        event.accept()
-        
+            if self.document.at_top:
+                if self.manager is not None:
+                    self.manager.previous_document()
+                    event.accept()
+                    return
+        ret = QWebView.wheelEvent(self, event)
+        if self.manager is not None:
+            self.manager.scrolled(self.scroll_fraction)
+        return ret
+    
     def keyPressEvent(self, event):
         key = event.key()
         if key in [Qt.Key_PageDown, Qt.Key_Space, Qt.Key_Down]:
diff --git a/src/calibre/gui2/viewer/main.py b/src/calibre/gui2/viewer/main.py
index b090b37882..fedebc66d7 100644
--- a/src/calibre/gui2/viewer/main.py
+++ b/src/calibre/gui2/viewer/main.py
@@ -242,6 +242,9 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
                      lambda x:self.view.previous_page())
         self.connect(self.action_find_next, SIGNAL('triggered(bool)'), 
                      lambda x:self.find(unicode(self.search.text()), True, repeat=True))
+        self.connect(self.action_full_screen, SIGNAL('triggered(bool)'),
+                     self.toggle_fullscreen)
+        self.action_full_screen.setShortcuts([Qt.Key_F11, Qt.CTRL+Qt.SHIFT+Qt.Key_F])
         self.connect(self.action_back, SIGNAL('triggered(bool)'), self.back)
         self.connect(self.action_bookmark, SIGNAL('triggered(bool)'), self.bookmark)
         self.connect(self.action_forward, SIGNAL('triggered(bool)'), self.forward)
@@ -263,6 +266,13 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         self.tool_bar.setContextMenuPolicy(Qt.PreventContextMenu)
         self.tool_bar2.setContextMenuPolicy(Qt.PreventContextMenu)
         self.tool_bar.widgetForAction(self.action_bookmark).setPopupMode(QToolButton.MenuButtonPopup)
+        self.action_full_screen.setCheckable(True)
+
+    def toggle_fullscreen(self, x):
+        if self.isFullScreen():
+            self.showNormal()
+        else:
+            self.showFullScreen()
     
     def goto(self, ref):
         if ref:
@@ -473,9 +483,12 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
         return current_page
         
     def save_current_position(self):
-        pos = self.view.bookmark()
-        bookmark = '%d#%s'%(self.current_index, pos)
-        self.iterator.add_bookmark(('calibre_current_page_bookmark', bookmark))
+        try:
+            pos = self.view.bookmark()
+            bookmark = '%d#%s'%(self.current_index, pos)
+            self.iterator.add_bookmark(('calibre_current_page_bookmark', bookmark))
+        except:
+            traceback.print_exc()
     
     def load_ebook(self, pathtoebook):
         if self.iterator is not None:
@@ -499,7 +512,7 @@ class EbookViewer(MainWindow, Ui_EbookViewer):
             self.metadata.show_opf(self.iterator.opf)
             title = self.iterator.opf.title
             if not title:
-                title = os.path.splitext(os.path.basename(pathtoebook))
+                title = os.path.splitext(os.path.basename(pathtoebook))[0]
             self.action_table_of_contents.setDisabled(not self.iterator.toc)
             if self.iterator.toc:
                 self.toc_model = TOC(self.iterator.toc)
@@ -571,7 +584,7 @@ View an ebook.
 
 def main(args=sys.argv):
     parser = option_parser()
-    opts, args = parser.parse_args(args)
+    args = parser.parse_args(args)[-1]
     pid = os.fork() if islinux else -1
     if pid <= 0:
         app = Application(args)
diff --git a/src/calibre/gui2/viewer/main.ui b/src/calibre/gui2/viewer/main.ui
index c409b437a2..59f813b2bd 100644
--- a/src/calibre/gui2/viewer/main.ui
+++ b/src/calibre/gui2/viewer/main.ui
@@ -27,8 +27,8 @@
       <widget class="QWidget" name="layoutWidget" >
        <layout class="QGridLayout" name="gridLayout" >
         <item row="0" column="0" >
-         <widget class="QWebView" name="view" >
-          <property name="url" >
+         <widget class="QWebView" native="1" name="view" >
+          <property name="url" stdset="0" >
            <url>
             <string>about:blank</string>
            </url>
@@ -88,6 +88,7 @@
    <addaction name="action_reference_mode" />
    <addaction name="separator" />
    <addaction name="action_preferences" />
+   <addaction name="action_full_screen" />
   </widget>
   <widget class="QToolBar" name="tool_bar2" >
    <attribute name="toolBarArea" >
@@ -224,6 +225,15 @@
     <string>Bookmark</string>
    </property>
   </action>
+  <action name="action_full_screen" >
+   <property name="icon" >
+    <iconset resource="../images.qrc" >
+     <normaloff>:/images/page.svg</normaloff>:/images/page.svg</iconset>
+   </property>
+   <property name="text" >
+    <string>Toggle full screen</string>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>
diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
index 5b3c2afe8f..caf2011a75 100644
--- a/src/calibre/gui2/widgets.py
+++ b/src/calibre/gui2/widgets.py
@@ -7,9 +7,9 @@ import re, os, traceback
 from PyQt4.QtGui import QListView, QIcon, QFont, QLabel, QListWidget, \
                         QListWidgetItem, QTextCharFormat, QApplication, \
                         QSyntaxHighlighter, QCursor, QColor, QWidget, QDialog, \
-                        QAbstractItemDelegate, QPixmap, QStyle, QFontMetrics
+                        QPixmap
 from PyQt4.QtCore import QAbstractListModel, QVariant, Qt, SIGNAL, \
-                         QObject, QRegExp, QString, QSettings
+                         QObject, QRegExp, QString, QSettings, QSize
 
 from calibre.gui2.jobs2 import DetailView
 from calibre.gui2 import human_readable, NONE, TableView, \
@@ -128,57 +128,19 @@ class ImageView(QLabel):
         self.setMaximumWidth(width)
         self.setMaximumHeight(height) 
 
-class LocationDelegate(QAbstractItemDelegate):
-    
-    def __init__(self):
-        QAbstractItemDelegate.__init__(self)
-        self.pixmap = QPixmap(40, 40)
-        self.text = QString('Reader\n999.9 MB Available202')
-    
-    def rects(self, option):
-        style = QApplication.style()
-        font = QFont(option.font)
-        font.setBold(True)
-        irect = style.itemPixmapRect(option.rect, Qt.AlignHCenter|Qt.AlignTop, self.pixmap)
-        trect = style.itemTextRect(QFontMetrics(font), option.rect, 
-                                   Qt.AlignHCenter|Qt.AlignTop, True, self.text)
-        trect.moveTop(irect.bottom())
-        return irect, trect
-    
-    def sizeHint(self, option, index):
-        irect, trect = self.rects(option) 
-        return irect.united(trect).size()
-    
-    def paint(self, painter, option, index):
-        style = QApplication.style()
-        painter.save()
-        if hasattr(QStyle, 'CE_ItemViewItem'):
-            QApplication.style().drawControl(QStyle.CE_ItemViewItem, option, painter)
-        highlight = getattr(index.model(), 'highlight_row', -1) == index.row()
-        mode = QIcon.Active if highlight else QIcon.Normal
-        pixmap = QIcon(index.model().data(index, Qt.DecorationRole)).pixmap(self.pixmap.size())
-        pixmap = style.generatedIconPixmap(mode, pixmap, option)
-        text = index.model().data(index, Qt.DisplayRole).toString()
-        irect, trect = self.rects(option)
-        style.drawItemPixmap(painter, irect, Qt.AlignHCenter|Qt.AlignTop, pixmap)
-        font = QFont(option.font)
-        font.setBold(highlight)
-        painter.setFont(font)
-        style.drawItemText(painter, trect, Qt.AlignHCenter|Qt.AlignBottom,
-                           option.palette, True, text)
-        painter.restore()
-        
         
 class LocationModel(QAbstractListModel):
+    
     def __init__(self, parent):
         QAbstractListModel.__init__(self, parent)
         self.icons = [QVariant(QIcon(':/library')),
                       QVariant(QIcon(':/images/reader.svg')),
                       QVariant(QIcon(':/images/sd.svg'))]
-        self.text = [_('Library'),
-                     _('Reader\n%s available'),
-                     _('Card\n%s available')]
+        self.text = [_('Library\n%d\nbooks'),
+                     _('Reader\n%s\navailable'),
+                     _('Card\n%s\navailable')]
         self.free = [-1, -1]
+        self.count = 0
         self.highlight_row = 0
         self.tooltips = [
                          _('Click to see the list of books available on your computer'),
@@ -194,12 +156,18 @@ class LocationModel(QAbstractListModel):
         data = NONE
         if role == Qt.DisplayRole:
             text = self.text[row]%(human_readable(self.free[row-1])) if row > 0 \
-                            else self.text[row]
+                            else self.text[row]%self.count
             data = QVariant(text)
         elif role == Qt.DecorationRole:                
             data = self.icons[row]
         elif role == Qt.ToolTipRole:
-            return QVariant(self.tooltips[row])
+            data = QVariant(self.tooltips[row])
+        elif role == Qt.SizeHintRole:
+            data = QVariant(QSize(155, 90))
+        elif role == Qt.FontRole:
+            font = QFont('monospace')
+            font.setBold(row == self.highlight_row)
+            data = QVariant(font)
         return data
     
     def headerData(self, section, orientation, role):
@@ -223,10 +191,12 @@ class LocationView(QListView):
         self.setModel(LocationModel(self))
         self.reset()
         QObject.connect(self.selectionModel(), SIGNAL('currentChanged(QModelIndex, QModelIndex)'), self.current_changed)
-        self.delegate = LocationDelegate()
-        self.setItemDelegate(self.delegate)  
         self.setCursor(Qt.PointingHandCursor)      
     
+    def count_changed(self, new_count):
+        self.model().count = new_count
+        self.model().reset()
+    
     def current_changed(self, current, previous):
         i = current.row()
         location = 'library' if i == 0 else 'main' if i == 1 else 'card'
@@ -270,7 +240,6 @@ class FontFamilyModel(QAbstractListModel):
         try:
             family = self.families[index.row()]
         except:
-            import traceback
             traceback.print_exc()
             return NONE
         if role == Qt.DisplayRole:
diff --git a/src/calibre/library/__init__.py b/src/calibre/library/__init__.py
index 297804875a..77d02e1354 100644
--- a/src/calibre/library/__init__.py
+++ b/src/calibre/library/__init__.py
@@ -28,4 +28,6 @@ def server_config(defaults=None):
               help=_('Username for access. By default, it is: %default'))
     c.add_opt('develop', ['--develop'], default=False,
               help='Development mode. Server automatically restarts on file changes and serves code files (html, css, js) from the file system instead of calibre\'s resource system.')
+    c.add_opt('max_cover', ['--max-cover'], default='600x800', 
+              help=_('The maximum size for displayed covers'))
     return c
diff --git a/src/calibre/library/cli.py b/src/calibre/library/cli.py
index d0158393e5..a3d81156dd 100644
--- a/src/calibre/library/cli.py
+++ b/src/calibre/library/cli.py
@@ -76,13 +76,23 @@ STANZA_TEMPLATE='''\
   <entry>
       <title>${record['title']}</title>
       <id>urn:calibre:${record['id']}</id>
-      <author><name>${record['authors']}</name></author>
+      <author><name>${record['author_sort']}</name></author>
       <updated>${record['timestamp'].strftime('%Y-%m-%dT%H:%M:%SZ')}</updated>
       <link type="application/epub+zip" href="${quote(record['fmt_epub'].replace(sep, '/')).replace('http%3A', 'http:')}" />
       <link py:if="record['cover']" rel="x-stanza-cover-image" type="image/png" href="${quote(record['cover'].replace(sep, '/')).replace('http%3A', 'http:')}" />
       <link py:if="record['cover']" rel="x-stanza-cover-image-thumbnail" type="image/png" href="${quote(record['cover'].replace(sep, '/')).replace('http%3A', 'http:')}" />
       <content type="xhtml">
-          <div xmlns="http://www.w3.org/1999/xhtml">${record['comments']}</div>
+          <div xmlns="http://www.w3.org/1999/xhtml">
+              <py:for each="f in ('authors','publisher','rating','tags','series', 'isbn')">
+              <py:if test="record[f]">
+              ${f.capitalize()}:${unicode(', '.join(record[f]) if f=='tags' else record[f])}<br/>
+              </py:if>
+              </py:for>
+              <py:if test="record['comments']">
+              <br/>
+              ${record['comments']}
+              </py:if>
+          </div>
       </content>
   </entry>
   </py:for>
@@ -358,8 +368,8 @@ list of id numbers (you can get id numbers by using the list command). For examp
 
     return 0
 
-def do_add_format(db, id, fmt, buffer):
-    db.add_format(id, fmt.upper(), buffer, index_is_id=True)
+def do_add_format(db, id, fmt, path):
+    db.add_format_with_hooks(id, fmt.upper(), path, index_is_id=True)
 
 
 def command_add_format(args, dbpath):
@@ -377,10 +387,10 @@ by id. You can get id by using the list command. If the format already exists, i
         print >>sys.stderr, _('You must specify an id and an ebook file')
         return 1
 
-    id, file, fmt = int(args[1]), open(args[2], 'rb'), os.path.splitext(args[2])[-1]
+    id, path, fmt = int(args[1]), args[2], os.path.splitext(args[2])[-1]
     if not fmt:
         print _('ebook file must have an extension')
-    do_add_format(get_db(dbpath, opts), id, fmt[1:], file)
+    do_add_format(get_db(dbpath, opts), id, fmt[1:], path)
     return 0
 
 def do_remove_format(db, id, fmt):
diff --git a/src/calibre/library/database.py b/src/calibre/library/database.py
index 1c1129db6b..f14a1174fc 100644
--- a/src/calibre/library/database.py
+++ b/src/calibre/library/database.py
@@ -943,7 +943,11 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
         if index_is_id:
             return self.conn.get('SELECT publisher FROM meta WHERE id=?', (index,), all=False)
         return self.data[index][3]
-
+    
+    def publisher_id(self, index, index_is_id=False):
+        id  = index if index_is_id else self.id(index)
+        return self.conn.get('SELECT publisher from books_publishers_link WHERE book=?', (id,), all=False)
+    
     def rating(self, index, index_is_id=False):
         if index_is_id:
             return self.conn.get('SELECT rating FROM meta WHERE id=?', (index,), all=False)
@@ -1041,6 +1045,14 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
     def all_series(self):
         return [ (i[0], i[1]) for i in \
                 self.conn.get('SELECT id, name FROM series')]
+        
+    def all_authors(self):
+        return [ (i[0], i[1]) for i in \
+                self.conn.get('SELECT id, name FROM authors')]
+    
+    def all_publishers(self):
+        return [ (i[0], i[1]) for i in \
+                self.conn.get('SELECT id, name FROM publishers')]
 
     def all_tags(self):
         return [i[0].strip() for i in self.conn.get('SELECT name FROM tags') if i[0].strip()]
@@ -1471,11 +1483,13 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
                                   (usize, data, id, ext))
         self.conn.commit()
 
-    def import_book_directory_multiple(self, dirpath):
+    def import_book_directory_multiple(self, dirpath, callback=None):
         dirpath = os.path.abspath(dirpath)
         duplicates = []
         books = {}
         for path in os.listdir(dirpath):
+            if callable(callback):
+                callback('.')
             path = os.path.abspath(os.path.join(dirpath, path))
             if os.path.isdir(path) or not os.access(path, os.R_OK):
                 continue
@@ -1500,13 +1514,18 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
                 duplicates.append((mi, formats))
                 continue
             self.import_book(mi, formats)
+            if callable(callback):
+                if callback(mi.title):
+                    break
         return duplicates
 
 
-    def import_book_directory(self, dirpath):
+    def import_book_directory(self, dirpath, callback=None):
         dirpath = os.path.abspath(dirpath)
         formats = []
         for path in os.listdir(dirpath):
+            if callable(callback):
+                callback('.')
             path = os.path.abspath(os.path.join(dirpath, path))
             if os.path.isdir(path) or not os.access(path, os.R_OK):
                 continue
@@ -1527,6 +1546,9 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
         if self.has_book(mi):
             return [(mi, formats)]
         self.import_book(mi, formats)
+        if callable(callback):
+            callback(mi.title)
+            
 
 
     def has_book(self, mi):
@@ -1535,13 +1557,19 @@ ALTER TABLE books ADD COLUMN isbn TEXT DEFAULT "" COLLATE NOCASE;
     def has_id(self, id):
         return self.conn.get('SELECT id FROM books where id=?', (id,), all=False) is not None
 
-    def recursive_import(self, root, single_book_per_directory=True):
+    def recursive_import(self, root, single_book_per_directory=True, callback=None):
         root = os.path.abspath(root)
         duplicates  = []
         for dirpath in os.walk(root):
-            res = self.import_book_directory(dirpath[0]) if single_book_per_directory else self.import_book_directory_multiple(dirpath[0])
+            res = self.import_book_directory(dirpath[0], callback=callback) if \
+                single_book_per_directory else \
+                  self.import_book_directory_multiple(dirpath[0], callback=callback)
             if res is not None:
                 duplicates.extend(res)
+            if callable(callback):
+                if callback(''):
+                    break
+            
         return duplicates
 
     def export_single_format_to_dir(self, dir, indices, format, index_is_id=False):
diff --git a/src/calibre/library/database2.py b/src/calibre/library/database2.py
index 17141e9520..d3cefa47fa 100644
--- a/src/calibre/library/database2.py
+++ b/src/calibre/library/database2.py
@@ -21,12 +21,12 @@ from calibre.library.sqlite import connect, IntegrityError
 from calibre.utils.search_query_parser import SearchQueryParser
 from calibre.ebooks.metadata import string_to_authors, authors_to_string
 from calibre.ebooks.metadata.meta import get_metadata
-from calibre.constants import preferred_encoding, iswindows, isosx
-
+from calibre.constants import preferred_encoding, iswindows, isosx, filesystem_encoding
+from calibre.ptempfile import PersistentTemporaryFile
+from calibre.customize.ui import run_plugins_on_import
+from calibre import sanitize_file_name
 
 copyfile = os.link if hasattr(os, 'link') else shutil.copyfile
-filesystem_encoding = sys.getfilesystemencoding()
-if filesystem_encoding is None: filesystem_encoding = 'utf-8'
 iscaseinsensitive = iswindows or isosx
 
 def normpath(x):
@@ -36,22 +36,6 @@ def normpath(x):
         x = x.lower()
     return x
 
-_filename_sanitize = re.compile(r'[\xae\0\\|\?\*<":>\+\[\]/]')
-def sanitize_file_name(name, substitute='_'):
-    '''
-    Sanitize the filename `name`. All invalid characters are replaced by `substitute`.
-    The set of invalid characters is the union of the invalid characters in Windows,
-    OS X and Linux. Also removes leading an trailing whitespace.
-    **WARNING:** This function also replaces path separators, so only pass file names
-    and not full paths to it.
-    *NOTE:* This function always returns byte strings, not unicode objects. The byte strings
-    are encoded in the filesystem encoding of the platform, or UTF-8. 
-    '''
-    if isinstance(name, unicode):
-        name = name.encode(filesystem_encoding, 'ignore')
-    one = _filename_sanitize.sub(substitute, name)
-    one = re.sub(r'\s', ' ', one).strip()
-    return re.sub(r'^\.+$', '_', one)
 
 FIELD_MAP = {'id':0, 'title':1, 'authors':2, 'publisher':3, 'rating':4, 'timestamp':5, 
              'size':6, 'tags':7, 'comments':8, 'series':9, 'series_index':10,
@@ -232,6 +216,9 @@ class ResultCache(SearchQueryParser):
     def row(self, id):
         return self.index(id)
     
+    def has_id(self, id):
+        return self._data[id] is not None
+    
     def refresh_ids(self, conn, ids):
         for id in ids:
             self._data[id] = conn.get('SELECT * from meta WHERE id=?', (id,))[0]
@@ -252,6 +239,9 @@ class ResultCache(SearchQueryParser):
             if id in self._map: self._map.remove(id)
             if id in self._map_filtered: self._map_filtered.remove(id)
     
+    def count(self):
+        return len(self._map)
+    
     def refresh(self, db, field=None, ascending=True):
         temp = db.conn.get('SELECT * FROM meta')
         self._data = list(itertools.repeat(None, temp[-1][0]+2)) if temp else []
@@ -304,10 +294,11 @@ class ResultCache(SearchQueryParser):
     
 class Tag(unicode):
     
-    def __init__(self, name):
-        unicode.__init__(self, name)
-        self.count = 0
-        self.state = 0
+    def __new__(cls, *args):
+        obj = super(Tag, cls).__new__(cls, *args)
+        obj.count = 0
+        obj.state = 0
+        return obj
         
     def as_string(self):
         return u'[%d] %s'%(self.count, self)
@@ -370,6 +361,8 @@ class LibraryDatabase2(LibraryDatabase):
         self.index   = self.data.index
         self.refresh_ids = functools.partial(self.data.refresh_ids, self.conn)
         self.row     = self.data.row
+        self.has_id  = self.data.has_id
+        self.count   = self.data.count
         
         self.refresh()
         
@@ -478,8 +471,8 @@ class LibraryDatabase2(LibraryDatabase):
         authors = self.authors(id, index_is_id=True)
         if not authors:
             authors = _('Unknown')
-        author = sanitize_file_name(authors.split(',')[0][:self.PATH_LIMIT]).decode(filesystem_encoding)
-        title  = sanitize_file_name(self.title(id, index_is_id=True)[:self.PATH_LIMIT]).decode(filesystem_encoding)
+        author = sanitize_file_name(authors.split(',')[0][:self.PATH_LIMIT]).decode(filesystem_encoding, 'replace')
+        title  = sanitize_file_name(self.title(id, index_is_id=True)[:self.PATH_LIMIT]).decode(filesystem_encoding, 'replace')
         name   = title + ' - ' + author
         return name
     
@@ -588,7 +581,7 @@ class LibraryDatabase2(LibraryDatabase):
                 data = data.read()
             p.loadFromData(data)
             p.save(path)
-            
+    
     def all_formats(self):
         formats = self.conn.get('SELECT format from data')
         if not formats:
@@ -647,6 +640,13 @@ class LibraryDatabase2(LibraryDatabase):
         if self.has_format(index, format, index_is_id):
             self.remove_format(id, format, index_is_id=True)
         
+    def add_format_with_hooks(self, index, format, fpath, index_is_id=False, 
+                              path=None, notify=True):
+        npath = self.run_import_plugins(fpath, format)
+        format = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
+        return self.add_format(index, format, open(npath, 'rb'), 
+                               index_is_id=index_is_id, path=path, notify=notify)
+    
     def add_format(self, index, format, stream, index_is_id=False, path=None, notify=True):
         id = index if index_is_id else self.id(index)
         if path is None:
@@ -752,7 +752,10 @@ class LibraryDatabase2(LibraryDatabase):
         newspapers = self.conn.get('SELECT name FROM tags WHERE id IN (SELECT DISTINCT tag FROM books_tags_link WHERE book IN (select book from books_tags_link where tag IN (SELECT id FROM tags WHERE name=?)))', (_('News'),))
         if newspapers:
             newspapers = [f[0] for f in newspapers]
-            newspapers.remove(_('News'))
+            try:
+                newspapers.remove(_('News'))
+            except ValueError:
+                pass
             categories['news'] = list(map(Tag, newspapers))
             for tag in categories['news']:
                 tag.count = self.conn.get('SELECT COUNT(id) FROM books_tags_link WHERE tag IN (SELECT DISTINCT id FROM tags WHERE name=?)', (tag,), all=False)
@@ -874,6 +877,14 @@ class LibraryDatabase2(LibraryDatabase):
         self.conn.commit()
         if notify:
             self.notify('metadata', [id])
+            
+    def set_timestamp(self, id, dt, notify=True):
+        if dt:
+            self.conn.execute('UPDATE books SET timestamp=? WHERE id=?', (dt, id))
+            self.data.set(id, FIELD_MAP['timestamp'], dt, row_is_id=True)
+            self.conn.commit()
+            if notify:
+                self.notify('metadata', [id])
     
     def set_publisher(self, id, publisher, notify=True):
         self.conn.execute('DELETE FROM books_publishers_link WHERE book=?',(id,))
@@ -1054,7 +1065,7 @@ class LibraryDatabase2(LibraryDatabase):
                               (mi.title, mi.authors[0]))
         id = obj.lastrowid
         self.data.books_added([id], self.conn)
-        self.set_path(id, True)
+        self.set_path(id, index_is_id=True)
         self.conn.commit()
         self.set_metadata(id, mi)
         
@@ -1065,6 +1076,18 @@ class LibraryDatabase2(LibraryDatabase):
         self.data.refresh_ids(self.conn, [id]) # Needed to update format list and size
         return id
     
+    def run_import_plugins(self, path_or_stream, format):
+        format = format.lower()
+        if hasattr(path_or_stream, 'seek'):
+            path_or_stream.seek(0)
+            pt = PersistentTemporaryFile('_import_plugin.'+format)
+            shutil.copyfileobj(path_or_stream, pt, 1024**2)
+            pt.close()
+            path = pt.name
+        else:
+            path = path_or_stream
+            return run_plugins_on_import(path, format)
+    
     def add_books(self, paths, formats, metadata, uris=[], add_duplicates=True):
         '''
         Add a book to the database. The result cache is not updated.
@@ -1085,20 +1108,24 @@ class LibraryDatabase2(LibraryDatabase):
                 continue
             series_index = 1 if mi.series_index is None else mi.series_index
             aus = mi.author_sort if mi.author_sort else ', '.join(mi.authors)
+            title = mi.title
+            if isinstance(aus, str):
+                aus = aus.decode(preferred_encoding, 'replace')
+            if isinstance(title, str):
+                title = title.decode(preferred_encoding)
             obj = self.conn.execute('INSERT INTO books(title, uri, series_index, author_sort) VALUES (?, ?, ?, ?)', 
-                              (mi.title, uri, series_index, aus))
+                              (title, uri, series_index, aus))
             id = obj.lastrowid
             self.data.books_added([id], self.conn)
             ids.append(id)
             self.set_path(id, True)
             self.conn.commit()
             self.set_metadata(id, mi)
-            stream = path if hasattr(path, 'read') else open(path, 'rb')
-            stream.seek(0)
-            
+            npath = self.run_import_plugins(path, format)
+            format = os.path.splitext(npath)[-1].lower().replace('.', '').upper()
+            stream = open(npath, 'rb')
             self.add_format(id, format, stream, index_is_id=True)
-            if not hasattr(path, 'read'):
-                stream.close()
+            stream.close()
         self.conn.commit()
         self.data.refresh_ids(self.conn, ids) # Needed to update format list and size
         if duplicates:
@@ -1183,9 +1210,6 @@ class LibraryDatabase2(LibraryDatabase):
         for i in iter(self):
             yield i['id']
             
-    def count(self):
-        return len(self.data._map)
-    
     def get_data_as_dict(self, prefix=None, authors_as_string=False):
         '''
         Return all metadata stored in the database as a dict. Includes paths to
diff --git a/src/calibre/library/server.py b/src/calibre/library/server.py
index ce70e075da..1fcd824a5f 100644
--- a/src/calibre/library/server.py
+++ b/src/calibre/library/server.py
@@ -14,7 +14,7 @@ from datetime import datetime
 from threading import Thread
 
 import cherrypy
-from PIL import Image
+from PyQt4.Qt import QImage, QApplication, QByteArray, Qt, QBuffer
 
 from calibre.constants import __version__, __appname__
 from calibre.utils.genshi.template import MarkupTemplate
@@ -112,6 +112,8 @@ class LibraryServer(object):
             item
             break
         self.opts = opts
+        self.max_cover_width, self.max_cover_height = \
+                        map(int, self.opts.max_cover.split('x'))
         
         cherrypy.config.update({
                                 'log.screen'             : opts.develop,
@@ -179,27 +181,37 @@ class LibraryServer(object):
         cherrypy.engine.exit()
     
     def get_cover(self, id, thumbnail=False):
-        cover = self.db.cover(id, index_is_id=True, as_file=True)
+        cover = self.db.cover(id, index_is_id=True, as_file=False)
         if cover is None:
-            cover = cStringIO.StringIO(server_resources['default_cover.jpg'])
+            cover = server_resources['default_cover.jpg']
         cherrypy.response.headers['Content-Type'] = 'image/jpeg'
         path = getattr(cover, 'name', False)
         updated = datetime.utcfromtimestamp(os.stat(path).st_mtime) if path and os.access(path, os.R_OK) else build_time
         cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
-        if not thumbnail:
-            return cover.read()
         try:
-            im = Image.open(cover)
-            width, height = im.size
-            scaled, width, height = fit_image(width, height, 80, 60)
+            if QApplication.instance() is None:
+                QApplication([])
+            
+            im = QImage()
+            im.loadFromData(cover)
+            if im.isNull():
+                raise cherrypy.HTTPError(404, 'No valid cover found')
+            width, height = im.width(), im.height()
+            scaled, width, height = fit_image(width, height, 
+                60 if thumbnail else self.max_cover_width, 
+                80 if thumbnail else self.max_cover_height)
             if not scaled:
-                return cover.read()
-            im.thumbnail((width, height))
-            o = cStringIO.StringIO()
-            im.save(o, 'JPEG')
-            return o.getvalue()
+                return cover
+            im = im.scaled(width, height, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+            ba = QByteArray()
+            buf = QBuffer(ba)
+            buf.open(QBuffer.WriteOnly)
+            im.save(buf, 'PNG')
+            return str(ba.data())
         except Exception, err:
-            raise cherrypy.HTTPError(404, 'failed to generate thumbnail: %s'%err)
+            import traceback
+            traceback.print_exc()
+            raise cherrypy.HTTPError(404, 'Failed to generate cover: %s'%err)
         
     def get_format(self, id, format):
         format = format.upper()
@@ -244,7 +256,9 @@ class LibraryServer(object):
         ' Feeds to read calibre books on a ipod with stanza.'
         books = []
         for record in iter(self.db):
-            if 'EPUB' in record[FIELD_MAP['formats']].upper():
+            r = record[FIELD_MAP['formats']]
+            r = r.upper() if r else ''
+            if 'EPUB' in r:
                 authors = ' & '.join([i.replace('|', ',') for i in record[FIELD_MAP['authors']].split(',')])
                 extra = []
                 rating = record[FIELD_MAP['rating']]
diff --git a/src/calibre/libunrar.py b/src/calibre/libunrar.py
index bb324282c3..7c608b72f1 100644
--- a/src/calibre/libunrar.py
+++ b/src/calibre/libunrar.py
@@ -7,7 +7,7 @@ This module provides a thin ctypes based wrapper around libunrar.
 See  ftp://ftp.rarlabs.com/rar/unrarsrc-3.7.5.tar.gz
 """
 import os, ctypes, sys, re
-from ctypes import Structure, c_char_p, c_uint, c_void_p, POINTER, \
+from ctypes import Structure as _Structure, c_char_p, c_uint, c_void_p, POINTER, \
                     byref, c_wchar_p, c_int, c_char, c_wchar
 from tempfile import NamedTemporaryFile
 from StringIO import StringIO
@@ -18,9 +18,12 @@ from calibre.ptempfile import TemporaryDirectory
 _librar_name = 'libunrar'
 cdll = ctypes.cdll
 if iswindows:
-    Structure._pack_ = 1
+    class Structure(_Structure):
+        _pack_ = 1
     _librar_name = 'unrar'
     cdll = ctypes.windll
+else:
+    Structure = _Structure
 if hasattr(sys, 'frozen') and iswindows:
     _libunrar = cdll.LoadLibrary(os.path.join(os.path.dirname(sys.executable), 'unrar.dll'))
 _libunrar = load_library(_librar_name, cdll)
diff --git a/src/calibre/linux.py b/src/calibre/linux.py
index f69b306b2b..a9d91282e5 100644
--- a/src/calibre/linux.py
+++ b/src/calibre/linux.py
@@ -2,10 +2,10 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 ''' Post installation script for linux '''
 import sys, os, re, shutil
-
 from subprocess import check_call, call
-from calibre import __version__, __appname__
+from tempfile import NamedTemporaryFile
 
+from calibre import __version__, __appname__
 from calibre.devices import devices
 
 DEVICES = devices()
@@ -47,6 +47,7 @@ entry_points = {
                              'fb2-meta  = calibre.ebooks.metadata.fb2:main',
                              'any2lrf   = calibre.ebooks.lrf.any.convert_from:main',
                              'any2epub  = calibre.ebooks.epub.from_any:main',
+                             'any2lit   = calibre.ebooks.lit.from_any:main',
                              'lrf2lrs   = calibre.ebooks.lrf.lrfparser:main',
                              'lrs2lrf   = calibre.ebooks.lrf.lrs.convert_from:main',
                              'pdfreflow = calibre.ebooks.lrf.pdf.reflow:main',
@@ -55,12 +56,15 @@ entry_points = {
                              'mobi2oeb  = calibre.ebooks.mobi.reader:main',
                              'lrf2html  = calibre.ebooks.lrf.html.convert_to:main',
                              'lit2oeb   = calibre.ebooks.lit.reader:main',
+                             'oeb2lit   = calibre.ebooks.lit.writer:main',
                              'comic2lrf = calibre.ebooks.lrf.comic.convert_from:main',
                              'comic2epub = calibre.ebooks.epub.from_comic:main',
+			     'comic2pdf  = calibre.ebooks.pdf.from_comic:main',
                              'calibre-debug      = calibre.debug:main',
                              'calibredb          = calibre.library.cli:main',
                              'calibre-fontconfig = calibre.utils.fontconfig:main',
-                             'calibre-parallel   = calibre.parallel:main',                             
+                             'calibre-parallel   = calibre.parallel:main',
+                             'calibre-customize  = calibre.customize.ui:main',                             
                            ],
         'gui_scripts'    : [
                             __appname__+' = calibre.gui2.main:main',
@@ -183,6 +187,7 @@ def setup_completion(fatal_errors):
         from calibre.ebooks.odt.to_oeb import option_parser as odt2oeb
         from calibre.ebooks.epub.from_feeds import option_parser as feeds2epub
         from calibre.ebooks.epub.from_any import option_parser as any2epub
+        from calibre.ebooks.lit.from_any import option_parser as any2lit
         from calibre.ebooks.epub.from_comic import option_parser as comic2epub
         from calibre.gui2.main import option_parser as guiop 
         any_formats = ['epub', 'htm', 'html', 'xhtml', 'xhtm', 'rar', 'zip',
@@ -206,7 +211,8 @@ def setup_completion(fatal_errors):
         f.write(opts_and_exts('pdf2lrf', htmlop, ['pdf']))
         f.write(opts_and_exts('any2lrf', htmlop, any_formats))
         f.write(opts_and_exts('calibre', guiop, any_formats))
-        f.write(opts_and_exts('any2lrf', any2epub, any_formats))
+        f.write(opts_and_exts('any2epub', any2epub, any_formats))
+        f.write(opts_and_exts('any2lit', any2lit, any_formats))
         f.write(opts_and_exts('lrf2lrs', lrf2lrsop, ['lrf']))
         f.write(opts_and_exts('lrf-meta', metaop, ['lrf']))
         f.write(opts_and_exts('rtf-meta', metaop, ['rtf']))
@@ -223,6 +229,7 @@ def setup_completion(fatal_errors):
         f.write(opts_and_exts('lit2oeb', lit2oeb, ['lit']))
         f.write(opts_and_exts('comic2lrf', comicop, ['cbz', 'cbr']))
         f.write(opts_and_exts('comic2epub', comic2epub, ['cbz', 'cbr']))
+	f.write(opts_and_exts('comic2pdf', comic2epub, ['cbz', 'cbr']))
         f.write(opts_and_words('feeds2disk', feeds2disk, feed_titles))
         f.write(opts_and_words('feeds2lrf', feeds2lrf, feed_titles))
         f.write(opts_and_words('feeds2lrf', feeds2epub, feed_titles))
@@ -396,9 +403,9 @@ def install_man_pages(fatal_errors):
     import subprocess
     print 'Installing MAN pages...'
     manpath = '/usr/share/man/man1'
-    f = open_file('/tmp/man_extra', 'wb')
+    f = NamedTemporaryFile()
     f.write('[see also]\nhttp://%s.kovidgoyal.net\n'%__appname__)
-    f.close()
+    f.flush()
     manifest = []
     os.environ['PATH'] += ':'+os.path.expanduser('~/bin')
     for src in entry_points['console_scripts']:
@@ -422,7 +429,8 @@ def install_man_pages(fatal_errors):
                 raise
             print 'Failed to install MAN pages as help2man is missing from your system'
             break
-        raw = re.compile(r'^\.IP\s*^([A-Z :]+)$', re.MULTILINE).sub(r'.SS\n\1', p.stdout.read())
+        o = p.stdout.read()
+        raw = re.compile(r'^\.IP\s*^([A-Z :]+)$', re.MULTILINE).sub(r'.SS\n\1', o)
         if not raw.strip():
             print 'Unable to create MAN page for', prog
             continue
@@ -464,6 +472,17 @@ def post_install():
             if os.stat(f).st_uid == 0:
                 os.unlink(f)
 
+def binary_install():
+    manifest = os.path.join(sys.frozen_path, 'manifest')
+    exes = [x.strip() for x in open(manifest).readlines()]
+    print 'Creating symlinks...'
+    for exe in exes:
+        dest = os.path.join('/usr', 'bin', exe)
+        if os.path.exists(dest):
+            os.remove(dest)
+        os.symlink(os.path.join(sys.frozen_path, exe), dest)
+    post_install()
+    return 0
 
 VIEWER = '''\
 [Desktop Entry]
@@ -579,7 +598,7 @@ def setup_desktop_integration(fatal_errors):
         print >>sys.stderr, 'Could not setup desktop integration. Error:'
         print err
 
-
+main = post_install
 if __name__ == '__main__':
     post_install()
 
diff --git a/src/calibre/linux_installer.py b/src/calibre/linux_installer.py
deleted file mode 100644
index e07cdc192a..0000000000
--- a/src/calibre/linux_installer.py
+++ /dev/null
@@ -1,327 +0,0 @@
-#!/usr/bin/env  python
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-'''
-Download and install the linux binary.
-'''
-import sys, os, shutil, tarfile, subprocess, tempfile, urllib2, re, stat
-
-MOBILEREAD='https://dev.mobileread.com/dist/kovid/calibre/'
-
-class TerminalController:
-    """
-    A class that can be used to portably generate formatted output to
-    a terminal.  
-    
-    `TerminalController` defines a set of instance variables whose
-    values are initialized to the control sequence necessary to
-    perform a given action.  These can be simply included in normal
-    output to the terminal:
-    
-    >>> term = TerminalController()
-    >>> print 'This is '+term.GREEN+'green'+term.NORMAL
-    
-    Alternatively, the `render()` method can used, which replaces
-    '${action}' with the string required to perform 'action':
-    
-    >>> term = TerminalController()
-    >>> print term.render('This is ${GREEN}green${NORMAL}')
-    
-    If the terminal doesn't support a given action, then the value of
-    the corresponding instance variable will be set to ''.  As a
-    result, the above code will still work on terminals that do not
-    support color, except that their output will not be colored.
-    Also, this means that you can test whether the terminal supports a
-    given action by simply testing the truth value of the
-    corresponding instance variable:
-    
-    >>> term = TerminalController()
-    >>> if term.CLEAR_SCREEN:
-    ...     print 'This terminal supports clearning the screen.'
-    
-    Finally, if the width and height of the terminal are known, then
-    they will be stored in the `COLS` and `LINES` attributes.
-    """
-    # Cursor movement:
-    BOL = ''             #: Move the cursor to the beginning of the line
-    UP = ''              #: Move the cursor up one line
-    DOWN = ''            #: Move the cursor down one line
-    LEFT = ''            #: Move the cursor left one char
-    RIGHT = ''           #: Move the cursor right one char
-    
-    # Deletion:
-    CLEAR_SCREEN = ''    #: Clear the screen and move to home position
-    CLEAR_EOL = ''       #: Clear to the end of the line.
-    CLEAR_BOL = ''       #: Clear to the beginning of the line.
-    CLEAR_EOS = ''       #: Clear to the end of the screen
-    
-    # Output modes:
-    BOLD = ''            #: Turn on bold mode
-    BLINK = ''           #: Turn on blink mode
-    DIM = ''             #: Turn on half-bright mode
-    REVERSE = ''         #: Turn on reverse-video mode
-    NORMAL = ''          #: Turn off all modes
-    
-    # Cursor display:
-    HIDE_CURSOR = ''     #: Make the cursor invisible
-    SHOW_CURSOR = ''     #: Make the cursor visible
-    
-    # Terminal size:
-    COLS = None          #: Width of the terminal (None for unknown)
-    LINES = None         #: Height of the terminal (None for unknown)
-    
-    # Foreground colors:
-    BLACK = BLUE = GREEN = CYAN = RED = MAGENTA = YELLOW = WHITE = ''
-    
-    # Background colors:
-    BG_BLACK = BG_BLUE = BG_GREEN = BG_CYAN = ''
-    BG_RED = BG_MAGENTA = BG_YELLOW = BG_WHITE = ''
-    
-    _STRING_CAPABILITIES = """
-    BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1
-    CLEAR_SCREEN=clear CLEAR_EOL=el CLEAR_BOL=el1 CLEAR_EOS=ed BOLD=bold
-    BLINK=blink DIM=dim REVERSE=rev UNDERLINE=smul NORMAL=sgr0
-    HIDE_CURSOR=cinvis SHOW_CURSOR=cnorm""".split()
-    _COLORS = """BLACK BLUE GREEN CYAN RED MAGENTA YELLOW WHITE""".split()
-    _ANSICOLORS = "BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE".split()
-    
-    def __init__(self, term_stream=sys.stdout):
-        """
-        Create a `TerminalController` and initialize its attributes
-        with appropriate values for the current terminal.
-        `term_stream` is the stream that will be used for terminal
-        output; if this stream is not a tty, then the terminal is
-        assumed to be a dumb terminal (i.e., have no capabilities).
-        """
-        # Curses isn't available on all platforms
-        try: import curses
-        except: return
-        
-        # If the stream isn't a tty, then assume it has no capabilities.
-        if not hasattr(term_stream, 'isatty') or not term_stream.isatty(): return
-        
-        # Check the terminal type.  If we fail, then assume that the
-        # terminal has no capabilities.
-        try: curses.setupterm()
-        except: return
-        
-        # Look up numeric capabilities.
-        self.COLS = curses.tigetnum('cols')
-        self.LINES = curses.tigetnum('lines')
-        
-        # Look up string capabilities.
-        for capability in self._STRING_CAPABILITIES:
-            (attrib, cap_name) = capability.split('=')
-            setattr(self, attrib, self._tigetstr(cap_name) or '')
-        
-        # Colors
-        set_fg = self._tigetstr('setf')
-        if set_fg:
-            for i,color in zip(range(len(self._COLORS)), self._COLORS):
-                setattr(self, color, curses.tparm(set_fg, i) or '')
-        set_fg_ansi = self._tigetstr('setaf')
-        if set_fg_ansi:
-            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
-                setattr(self, color, curses.tparm(set_fg_ansi, i) or '')
-        set_bg = self._tigetstr('setb')
-        if set_bg:
-            for i,color in zip(range(len(self._COLORS)), self._COLORS):
-                setattr(self, 'BG_'+color, curses.tparm(set_bg, i) or '')
-        set_bg_ansi = self._tigetstr('setab')
-        if set_bg_ansi:
-            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
-                setattr(self, 'BG_'+color, curses.tparm(set_bg_ansi, i) or '')
-    
-    def _tigetstr(self, cap_name):
-        # String capabilities can include "delays" of the form "$<2>".
-        # For any modern terminal, we should be able to just ignore
-        # these, so strip them out.
-        import curses
-        cap = curses.tigetstr(cap_name) or ''
-        return re.sub(r'\$<\d+>[/*]?', '', cap)
-    
-    def render(self, template):
-        """
-        Replace each $-substitutions in the given template string with
-        the corresponding terminal control string (if it's defined) or
-        '' (if it's not).
-        """
-        return re.sub(r'\$\$|\${\w+}', self._render_sub, template)
-    
-    def _render_sub(self, match):
-        s = match.group()
-        if s == '$$': return s
-        else: return getattr(self, s[2:-1])
-
-#######################################################################
-# Example use case: progress bar
-#######################################################################
-
-class ProgressBar:
-    """
-    A 3-line progress bar, which looks like::
-    
-    Header
-    20% [===========----------------------------------]
-    progress message
-    
-    The progress bar is colored, if the terminal supports color
-    output; and adjusts to the width of the terminal.
-    """
-    BAR = '%3d%% ${GREEN}[${BOLD}%s%s${NORMAL}${GREEN}]${NORMAL}\n'
-    HEADER = '${BOLD}${CYAN}%s${NORMAL}\n\n'
-    
-    def __init__(self, term, header):
-        self.term = term
-        if not (self.term.CLEAR_EOL and self.term.UP and self.term.BOL):
-            raise ValueError("Terminal isn't capable enough -- you "
-            "should use a simpler progress dispaly.")
-        self.width = self.term.COLS or 75
-        self.bar = term.render(self.BAR)
-        self.header = self.term.render(self.HEADER % header.center(self.width))
-        self.cleared = 1 #: true if we haven't drawn the bar yet.
-        
-    def update(self, percent, message=''):
-        if isinstance(message, unicode):
-            message = message.encode('utf-8', 'ignore')
-        if self.cleared:
-            sys.stdout.write(self.header)
-            self.cleared = 0
-        n = int((self.width-10)*percent)
-        msg = message.center(self.width)
-        sys.stdout.write(
-        self.term.BOL + self.term.UP + self.term.CLEAR_EOL +
-        (self.bar % (100*percent, '='*n, '-'*(self.width-10-n))) +
-        self.term.CLEAR_EOL + msg)
-        sys.stdout.flush()
-    
-    def clear(self):
-        if not self.cleared:
-            sys.stdout.write(self.term.BOL + self.term.CLEAR_EOL +
-            self.term.UP + self.term.CLEAR_EOL +
-            self.term.UP + self.term.CLEAR_EOL)
-            self.cleared = 1
-
-
-LAUNCHER='''\
-#!/bin/bash
-frozen_path=%s
-export ORIGWD=`pwd`
-export LD_LIBRARY_PATH=$frozen_path:$LD_LIBRARY_PATH
-cd $frozen_path
-./%s "$@"
-'''
-
-def extract_tarball(tar, destdir):
-    print 'Extracting application files...'
-    if hasattr(tar, 'read'):
-        try:
-            tarfile.open(fileobj=tar, mode='r').extractall(destdir)
-        except: # tarfile.py on Fedora 9 is buggy
-            subprocess.check_call(['tar', 'xjf', tar.name, '-C', destdir])
-    else:
-        tarfile.open(tar, 'r').extractall(destdir)
-
-def create_launchers(destdir, bindir='/usr/bin'):
-    manifest = []
-    for launcher in open(os.path.join(destdir, 'manifest')).readlines():
-        if 'postinstall' in launcher:
-            continue
-        launcher = launcher.strip()
-        lp = os.path.join(bindir, launcher)
-        print 'Creating', lp
-        open(lp, 'wb').write(LAUNCHER%(destdir, launcher))
-        os.chmod(lp, stat.S_IXUSR|stat.S_IXOTH|stat.S_IXGRP|stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
-        manifest.append(lp)
-    return manifest
-        
-def do_postinstall(destdir):
-    cwd = os.getcwd()
-    t = tempfile.NamedTemporaryFile()
-    try:
-        os.chdir(destdir)
-        os.environ['LD_LIBRARY_PATH'] = destdir+':'+os.environ.get('LD_LIBRARY_PATH', '')
-        os.environ['PYTHONPATH'] = destdir
-        os.environ['PYTHONSTARTUP'] = ''
-        subprocess.call((os.path.join(destdir, 'calibre_postinstall'), '--save-manifest-to', t.name))
-    finally:
-        os.chdir(cwd)
-    t.seek(0)
-    return list(t.readlines())
-
-def download_tarball():
-    try:
-        pb  = ProgressBar(TerminalController(sys.stdout), 'Downloading calibre...')
-    except ValueError:
-        print 'Downloading calibre...'
-        pb = None
-    local = 'calibre-test.tar.bz2'
-    src = open(local) if os.access(local, os.R_OK) else urllib2.urlopen(MOBILEREAD+'calibre-%version-i686.tar.bz2')
-    if hasattr(src, 'info'):
-            size = int(src.info()['content-length'])
-    else:
-        src.seek(0, 2)
-        size = src.tell()
-        src.seek(0)
-    f = tempfile.NamedTemporaryFile()
-    while f.tell() < size:
-        f.write(src.read(4*1024))
-        percent = f.tell()/float(size)
-        if pb is not None:
-            pb.update(percent)
-        else:
-            print '%d%%, '%int(percent*100),
-    f.seek(0)
-    return f
-
-def main(args=sys.argv):
-    defdir = '/opt/calibre'
-    destdir = raw_input('Enter the installation directory for calibre (Its contents will be deleted!)[%s]: '%defdir).strip()
-    if not destdir:
-        destdir = defdir
-    if os.path.exists(destdir):
-        shutil.rmtree(destdir)
-    os.makedirs(destdir)
-    
-    f = download_tarball()
-    
-    print 'Extracting...'
-    extract_tarball(f, destdir)
-    manifest =  create_launchers(destdir)
-    manifest += do_postinstall(destdir)
-    
-    manifest += ['/usr/bin/calibre-uninstall']
-    
-    UNINSTALLER = '''\
-#!/usr/bin/env python
-import os, sys
-if os.geteuid() != 0:
-    print 'You must run this uninstaller as root'
-    sys.exit(0)
-manifest = %s
-failures = []
-for path in manifest:
-    print 'Deleting', path
-    try:
-        os.unlink(path)
-    except:
-        failures.append(path)
-        
-print 'Uninstalling complete.'
-if failures:
-    print 'Failed to remove the following files:'
-    for f in failures: print f
-'''%repr(manifest)
-    
-    open('/usr/bin/calibre-uninstall', 'wb').write(UNINSTALLER)
-    os.chmod('/usr/bin/calibre-uninstall', 
-             stat.S_IXUSR|stat.S_IXOTH|stat.S_IXGRP|stat.S_IREAD|stat.S_IWRITE|stat.S_IRGRP|stat.S_IROTH)
-    
-    print 'You can uninstall calibre by running sudo calibre-uninstall'
-    
-    return 0
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/src/calibre/manual/customize.rst b/src/calibre/manual/customize.rst
new file mode 100644
index 0000000000..0efb6a3f63
--- /dev/null
+++ b/src/calibre/manual/customize.rst
@@ -0,0 +1,114 @@
+.. include:: global.rst
+
+.. currentmodule:: calibre.customize.__init__
+
+.. _customize:
+
+Customizing |app|
+==================================
+
+|app| has a highly modular design. Various parts of it can be customized. You can learn how to create
+*recipes* to add new sources of online content to |app| in the Section :ref:`news`. Here, you will learn how to
+use *plugins* to customize and control various aspects of |app|'s behavior. 
+
+Theer are different kinds of plugins, corresponding to different aspects of |app|. As more and more aspects of |app|
+are modularized, new plugin types will be added.
+
+.. contents::
+    :depth: 2
+    :local:
+
+A Hello World plugin
+------------------------
+
+Suppose you have an installation of |app| that you are using to self publish various e-documents in EPUB and LRF
+format. You would like all file generated by |app| to have their publisher set as "Hello world", here's how to do it.
+Create a file name :file:`my_plugin.py` (the file name must end with plugin.py) and enter the following Python code into it:
+
+.. code-block:: python
+
+  import os
+  from calibre.customize import FileTypePlugin
+
+  class HelloWorld(FileTypePlugin):
+
+    name                = 'Hello World Plugin' # Name of the plugin
+    description         = 'Set the publisher to Hello World for all new conversions' 
+    supported_platforms = ['windows', 'osx', 'linux'] # Platforms this plugin will run on
+    author              = 'Acme Inc.' # The author of this plugin
+    version             = (1, 0, 0)   # The version number of this plugin
+    file_types          = set(['epub', 'lrf']) # The file types that this plugin will be applied to
+    on_postprocess      = True # Run this plugin after conversion is complete
+    
+    def run(self, path_to_ebook):
+      from calibre.ebooks.metadata.meta import get_metadata, set_metadata
+      file = open(path_to_ebook, 'r+b')
+      ext  = os.path.splitext(path_to_ebook)[-1][1:].lower()
+      mi = get_metadata(file, ext)
+      mi.publisher = 'Hello World'
+      set_metadata(file, mi, ext)
+      return path_to_ebook
+
+That's all. To add this code to |app| as a plugin, simply create a zip file with::
+
+    zip plugin.zip my_plugin.py
+
+You can download the Hello World plugin from 
+`helloworld_plugin.zip  <http://calibre.kovidgoyal.net/downloads/helloworld_plugin.zip>`_. 
+Now either use the configuration dialog in |app| GUI to add this zip file as a plugin, or
+use the command::
+
+    calibre-customize -a plugin.zip
+
+Every time you use calibre to convert a book, the plugin's :meth:`run` method will be called and the 
+converted book will have its publisher set to "Hello World". For more information about 
+|app|'s plugin system, read on...
+
+The Plugin base class
+------------------------
+
+As you may have noticed above, all |app| plugins are classes. The Plugin classes are organized in a hierarchy at the top of which
+is :class:`calibre.customize.Plugin`. The has excellent in source documentation for its various features, here I will discuss a
+few of the important ones.
+
+First, all plugins must supply a list of platforms they have been tested on by setting the ``supported_platforms`` member as in the
+example above. 
+
+If the plugin needs to do any initialization, it should implement the :meth:`initialize` method. The path to the plugin zip file
+is available as ``self.plugin_path``. The initialization method could be used to load any needed resources from the zip file. 
+
+If the plugin needs to be customized (i.e. it needs some information from the user), it should implement the :meth:`customization_help`
+method, to indicate to |app| that it needs user input. This can be useful, for example, to ask the user to input the path to a needed system 
+binary or the URL of a website, etc. When |app| asks the user for the customization information, the string retuned by the :meth:`customization_help`
+method is used as help text to le thte user know what information is needed. 
+
+Another useful method is :meth:`temporary_file`, which returns a file handle to an opened temporary file. If your plugin needs to make use 
+of temporary files, it should use this method. Temporary file cleanup is then taken care of automatically.
+
+In addition, whenever plugins are run, their zip files are automatically added to the start of ``sys.path``, so you can directly import
+any python files you bundle in the zip files. Note that this is not available when the plugin is being initialized, only when it is being run.
+
+Finally, plugins can have a priority (a positive integer). Higher priority plugins are run in preference tolower priority ones in a given context. 
+By default all plugins have priority 1. You can change that by setting the member :attr:'priority` in your subclass.
+
+See :ref:`pluginsPlugin` for details.
+
+File type plugins
+-------------------
+
+File type plugins are intended to be associated with specific file types (as identified by extension). They can be run on several different occassions.
+
+  * When books/formats are added ot the |app| database (if :attr:`on_import` is set to True).
+  * Just before an any2whatever converter is run on an input file (if :attr:`on_preprocess` is set to True).
+  * After an any2whatever converter has run, on the output file (if :attr:`on_postprocess` is set to True).
+
+File type plugins specify which file types they are associated with by specifying the :attr:`file_types` member as in the above example.
+the actual work should be done in the :meth:`run` method, which must return the path to the modified ebook (it can be the same as the original
+if the modifcations are done in place). 
+
+See :ref:`pluginsFTPlugin` for details.
+
+Metadata plugins
+-------------------
+
+Metadata plugins add the ability to read/write metadata from ebook files to |app|. See :ref:`pluginsMetadataPlugin` for details. 
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 1c99c2afd5..4b3c217698 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -102,7 +102,7 @@ Device Integration
 
 What devices does |app| support?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-At the moment |app| has full support for the SONY PRS500 and PRS505. However, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
+At the moment |app| has full support for the SONY PRS 500/505/700 as well as the iPhone. In addition, using the :guilabel:`Save to disk` function you can use it with any ebook reader that exports itself as a USB disk.
 
 I used |app| to transfer some books to my reader, and now the SONY software hangs every time I connect the reader?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -117,6 +117,17 @@ Can I use the collections feature of the SONY reader?
 |app| has full support for collections. When you add tags to a book's metadata, those tags are turned into collections when you upload the book to the SONY reader. Also, the series information is automatically
 turned into a collection on the reader. Note that the PRS-500 does not support collections for books stored on the SD card. The PRS-505 does. 
 
+How do I use |app| with my iPhone?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+First install the Stanza reader on your iPhone from http://www.lexcycle.com . Then,
+  * Set the output format for calibre to EPUB (this can be done in the configuration dialog accessed by the little hammer icon next to the search bar)
+  * Convert the books you want to read on your iPhone to EPUB format by selecting them and clicking the Convert button.
+  * Turn on the Content Server in the configurations dialog and leave |app| running.
+  * In the Stanza reader on your iPhone, add a new catalog. The URL of the catalog is of the form 
+    ``http://10.34.56.89:8080/stanza``,  where you should replace the IP address ``10.34.56.89`` 
+    with the IP address of your computer. Stanza will the use the |app| content server to access all the
+    EPUB books in your |app| database.
+
 Library Management
 ------------------
 
@@ -132,6 +143,15 @@ Where are the book files stored?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 When you first run |app|, it will ask you for a folder in which to store your books. Whenever you add a book to |app|, it will copy the book into that folder. Books in the folder are nicely arranged into sub-folders by Author and Title. Metadata about the books is stored in the file ``metadata.db`` (which is a sqlite database).
 
+Why doesn't |app| let me store books in my own directory structure?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The whole point if |app|'s library management features is that they provide an interface for locating books that is *much* more efficient than any possible directory scheme you could come up with for your collection. Indeed, once you become comfortable using |app|'s interface to find, sort and browse your collection, you wont ever feel the need to hunt through the files on your disk to find a book again. By managing books in its own directory struture of Author -> Title -> Book files, |app| is able to achieve a high level of reliability and standardization.  
+
+Why doesn't |app| have a column for foo?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+|app| is designed to have columns for the most frequently and widely used fields. If it does not have a coulmn for your favorite field, you can always add a tag to the book for that piece of information. |app| also supports a general purpose "comments" fields for longer items.
+
 
 Content From The Web
 ---------------------
@@ -142,8 +162,9 @@ Content From The Web
 My downloaded news content causes the reader to reset. 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 This is a bug in the SONY firmware. The problem can be mitigated by switching the output format to EPUB
-in the configuration dialog. EPUB files typically only cause the reader to reset when clicking on certain
-links. Alternatively, you can use the LRF output format and use the SONY software to transfer the files to the reader. The SONY software pre-paginates the LRF file, thereby reducing the number of resets.
+in the configuration dialog. Alternatively, you can use the LRF output format and use the SONY software 
+to transfer the files to the reader. The SONY software pre-paginates the LRF file, 
+thereby reducing the number of resets.
 
 I obtained a recipe for a news site as a .py file from somewhere, how do I use it?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -191,7 +212,7 @@ There can be several causes for this:
 
 If it still wont launch, start a command prompt (press the windows key and R; then type :command:`cmd.exe` in the Run dialog that appears). At the command prompt type the following command and press Enter::
 
-    calibre-debug -c "from calibre.gui2.main import main; main()"
+    calibre-debug -g
 
 Post any output you see in a help message on the `Forum <http://www.mobileread.com/forums/forumdisplay.php?f=166>`_.
     
diff --git a/src/calibre/manual/index.rst b/src/calibre/manual/index.rst
index cfda23762a..376145873e 100644
--- a/src/calibre/manual/index.rst
+++ b/src/calibre/manual/index.rst
@@ -30,6 +30,7 @@ Sections
    metadata
    faq 
    xpath
+   customize
    glossary
 
 Convenience
diff --git a/src/calibre/manual/news.rst b/src/calibre/manual/news.rst
index 871b0beb09..025f38ec22 100644
--- a/src/calibre/manual/news.rst
+++ b/src/calibre/manual/news.rst
@@ -133,7 +133,7 @@ to the recipe. Finally, lets replace some of the :term:`CSS` that we disabled ea
 
 With these additions, our recipe has become "production quality", indeed it is very close to the actual recipe used by |app| for the *BBC*, shown below:
 
-.. literalinclude:: ../web/feeds/recipes/bbc.py
+.. literalinclude:: ../web/feeds/recipes/recipe_bbc.py
 
 This :term:`recipe` explores only the tip of the iceberg when it comes to the power of |app|. To explore more of the abilities of |app| we'll examine a more complex real life example in the next section.
 
diff --git a/src/calibre/manual/plugins.rst b/src/calibre/manual/plugins.rst
new file mode 100644
index 0000000000..706dc281d3
--- /dev/null
+++ b/src/calibre/manual/plugins.rst
@@ -0,0 +1,100 @@
+.. include:: global.rst
+
+.. _plugins:
+
+API Documentation for plugins
+===============================
+
+.. module:: calibre.customize.__init__
+    :synopsis: Defines various abstract base classes that can be subclassed to create plugins.
+
+Defines various abstract base classes that can be subclassed to create powerful plugins. The useful
+classes are:
+
+.. contents::
+    :depth: 1
+    :local:
+
+.. _pluginsPlugin:
+
+Plugin
+-----------------
+
+.. class:: Plugin
+
+    Abstract base class that contains a number of members and methods to create your plugin. All
+    plugins must inherit from this class or a subclass of it.
+
+    The members and methods are:
+
+.. automember:: Plugin.name
+
+.. automember:: Plugin.author
+
+.. automember:: Plugin.description
+
+.. automember:: Plugin.version
+
+.. automember:: Plugin.supported_platforms
+
+.. automember:: Plugin.priority
+
+.. automember:: Plugin.minimum_calibre_version
+
+.. automember:: Plugin.can_be_disabled
+
+.. automethod:: Plugin.initialize
+
+.. automethod:: Plugin.customization_help
+
+.. automethod:: Plugin.temporary_file
+
+.. _pluginsFTPlugin:
+
+FileTypePlugin
+-----------------
+
+.. class:: Plugin
+
+    Abstract base class that contains a number of members and methods to create your file type plugin. All file type
+    plugins must inherit from this class or a subclass of it.
+
+    The members and methods are:
+
+.. automember:: FileTypePlugin.file_types
+
+.. automember:: FileTypePlugin.on_import
+
+.. automember:: FileTypePlugin.on_preprocess
+
+.. automember:: FileTypePlugin.on_postprocess
+
+.. automethod:: FileTypePlugin.run
+
+.. _pluginsMetadataPlugin:
+
+Metadata plugins
+-------------------
+
+.. class:: MetadataReaderPlugin
+
+    Abstract base class that contains a number of members and methods to create your metadata reader plugin. All metadata
+    reader plugins must inherit from this class or a subclass of it.
+
+    The members and methods are:
+
+.. automember:: MetadataReaderPlugin.file_types
+
+.. automethod:: MetadataReaderPlugin.get_metadata
+
+
+.. class:: MetadataWriterPlugin
+
+    Abstract base class that contains a number of members and methods to create your metadata writer plugin. All metadata
+    writer plugins must inherit from this class or a subclass of it.
+
+    The members and methods are:
+
+.. automember:: MetadataWriterPlugin.file_types
+
+.. automethod:: MetadataWriterPlugin.set_metadata
diff --git a/src/calibre/parallel.py b/src/calibre/parallel.py
index 0b84568a9f..45ceff5132 100644
--- a/src/calibre/parallel.py
+++ b/src/calibre/parallel.py
@@ -31,7 +31,8 @@ from threading import RLock, Thread, Event
 from math import ceil
 
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre import iswindows, detect_ncpus, isosx
+from calibre import iswindows, detect_ncpus, isosx, preferred_encoding
+from calibre.utils.config import prefs
 
 DEBUG = False
 
@@ -223,6 +224,8 @@ class WorkerMother(object):
         return child
 
     def spawn_free_spirit_windows(self, arg, type='free_spirit'):
+        priority = {'high':win32process.HIGH_PRIORITY_CLASS, 'normal':win32process.NORMAL_PRIORITY_CLASS,
+                    'low':win32process.IDLE_PRIORITY_CLASS}[prefs['worker_process_priority']]
         fd, name = tempfile.mkstemp('.log', 'calibre_'+type+'_')
         handle = msvcrt.get_osfhandle(fd)
         si = win32process.STARTUPINFO()
@@ -236,7 +239,7 @@ class WorkerMother(object):
             None,    # processAttributes
             None,    # threadAttributes
             1,       # bInheritHandles
-            win32process.CREATE_NO_WINDOW, # Dont want ugly console popping up
+            win32process.CREATE_NO_WINDOW|priority, # Dont want ugly console popping up
             self.get_env(), # New environment
             None,    # Current directory
             si
@@ -564,23 +567,27 @@ class Job(object):
             return 'ERROR'
             
     def console_text(self):
-        ans = [u'Error in job: ']
+        ans = [u'Job: ']
         if self.description:
             ans[0] += self.description
+        if self.exception is not None:
+            header = unicode(self.exception.__class__.__name__) if \
+                    hasattr(self.exception, '__class__') else u'Error'
+            header = u'**%s**'%header
+            header += u': '
+            try:
+                header += unicode(self.exception)
+            except:
+                header += unicode(repr(self.exception))
+            ans.append(header)
+            if self.traceback:
+                ans.append(u'**Traceback**:')
+                ans.extend(self.traceback.split('\n'))
+        
         if self.log:
             if isinstance(self.log, str):
                 self.log = unicode(self.log, 'utf-8', 'replace')
             ans.append(self.log)
-        header = unicode(self.exception.__class__.__name__) if \
-                hasattr(self.exception, '__class__') else u'Error'
-        header += u': '
-        try:
-            header += unicode(self.exception)
-        except:
-            header += unicode(repr(self.exception))
-        ans.append(header)
-        if self.traceback:
-            ans.append(self.traceback)
         return (u'\n'.join(ans)).encode('utf-8')
     
     def gui_text(self):
@@ -607,8 +614,10 @@ class Job(object):
             if isinstance(self.log, str):
                 self.log = unicode(self.log, 'utf-8', 'replace')
             ans.extend(self.log.split('\n'))
-            
-        return '\n'.join(ans)
+        
+        ans = [x.decode(preferred_encoding, 'replace') if isinstance(x, str) else x for x in ans]
+        
+        return u'<br>'.join(ans)
 
 
 class ParallelJob(Job):
diff --git a/src/calibre/path.py b/src/calibre/path.py
index b4829662dd..44f07a1455 100644
--- a/src/calibre/path.py
+++ b/src/calibre/path.py
@@ -29,7 +29,7 @@ Date:    9 Mar 2007
 
 from __future__ import generators
 
-import sys, warnings, os, fnmatch, glob, shutil, codecs, md5
+import sys, warnings, os, fnmatch, glob, shutil, codecs, hashlib
 
 __version__ = '2.2'
 __all__ = ['path']
@@ -767,7 +767,7 @@ class path(_base):
         """
         f = self.open('rb')
         try:
-            m = md5.new()
+            m = hashlib.md5()
             while True:
                 d = f.read(8192)
                 if not d:
diff --git a/src/calibre/startup.py b/src/calibre/startup.py
index fc2749323a..eebec7d784 100644
--- a/src/calibre/startup.py
+++ b/src/calibre/startup.py
@@ -85,6 +85,8 @@ if not _run_once:
         to byte strings using `encoding`, calls abspath and then decodes back to unicode.
         '''
         to_unicode = False
+        if encoding is None:
+            encoding = preferred_encoding
         if isinstance(path, unicode):
             path = path.encode(encoding)
             to_unicode = True
@@ -97,6 +99,8 @@ if not _run_once:
     _join = os.path.join
     def my_join(a, *p):
         encoding=sys.getfilesystemencoding()
+        if not encoding:
+            encoding = preferred_encoding
         p = [a] + list(p)
         _unicode = False
         for i in p:
diff --git a/src/calibre/trac/donations/server.py b/src/calibre/trac/donations/server.py
index ce44dc0438..cbb68d972e 100644
--- a/src/calibre/trac/donations/server.py
+++ b/src/calibre/trac/donations/server.py
@@ -21,7 +21,7 @@ from lxml import etree
 
 def range_for_month(year, month):
     ty, tm = date.today().year, date.today().month
-    min = date(year=year, month=month, day=1)
+    min = max = date(year=year, month=month, day=1)
     x = date.today().day if ty == year and tm == month else 31
     while x > 1:
         try:
@@ -102,10 +102,12 @@ class Stats:
 
     def get_deviation(self, amounts):
         l = float(len(amounts))
+        if l == 0:
+            return 0
         mean = sum(amounts)/l
         return sqrt( sum([i**2 for i in amounts])/l - mean**2  )
 
-    def __init__(self, records):
+    def __init__(self, records, start, end):
         self.total = sum([r.amount for r in records])
         self.days = {}
         l, rg = date.max, date.min
@@ -117,15 +119,15 @@ class Stats:
                 self.days[r.date] = []
             self.days[r.date].append(r)
             
-        self.min, self.max = l, rg
-        self.period = self.max - self.min
+        self.min, self.max = start, end
+        self.period = (self.max - self.min) + timedelta(days=1)
         daily_totals = []
         day = self.min
         while day <= self.max:
             x = self.days.get(day, [])
             daily_totals.append(sum([y.amount for y in x]))
             day += timedelta(days=1)
-        self.daily_average = self.total/len(daily_totals) if len(daily_totals) else 0.
+        self.daily_average = self.total/self.period.days
         self.daily_deviation = self.get_deviation(daily_totals)
         self.average = self.total/len(records) if len(records) else 0.
         self.average_deviation = self.get_deviation(self.totals)
@@ -184,13 +186,27 @@ def expose(func):
 class Server(object):
     
     TRENDS = '/tmp/donations_trend.png'
+    MONTH_TRENDS = '/tmp/donations_month_trend.png'
     
     def __init__(self, apache=False, root='/', data_file='/tmp/donations.xml'):
         self.apache = apache
         self.document_root = root
         self.data_file = data_file
         self.read_records()
-        
+    
+    def calculate_month_trend(self, days=31):
+        stats = self.get_slice(date.today()-timedelta(days=days-1), date.today())
+        fig = plt.figure(2, (8, 3), 96)#, facecolor, edgecolor, frameon, FigureClass)
+        ax = fig.add_subplot(111)
+        x = list(range(days-1, -1, -1))
+        y = stats.daily_totals
+        ax.plot(x, y)#, align='center', width=20, color='g')
+        ax.set_xlabel('Days ago')
+        ax.set_ylabel('Income ($)')
+        ax.hlines([stats.daily_average], 0, days-1)
+        ax.set_xlim([0, days-1])
+        fig.savefig(self.MONTH_TRENDS)
+    
     def calculate_trend(self):
         def months(start, end):
             pos = range_for_month(start.year, start.month)[0]
@@ -208,7 +224,7 @@ class Server(object):
         x = [m.min for m in _months]
         y = [m.total for m in _months]
         ml   = mdates.MonthLocator() # every month
-        fig = plt.figure(None, (8, 3), 96)#, facecolor, edgecolor, frameon, FigureClass)
+        fig = plt.figure(1, (8, 3), 96)#, facecolor, edgecolor, frameon, FigureClass)
         ax = fig.add_subplot(111)
         ax.bar(x, y, align='center', width=20, color='g')
         ax.xaxis.set_major_locator(ml)
@@ -235,14 +251,11 @@ class Server(object):
             max_date = max(max_date, d)
         self.earliest, self.latest = min_date, max_date
         self.calculate_trend()
+        self.calculate_month_trend()
             
     def get_slice(self, start_date, end_date):
-        stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date])
-        if start_date > date.min and end_date < date.max:
-            stats.period = end_date - start_date
-            stats.period += timedelta(days=1)
-            stats.min = start_date
-            stats.max = end_date
+        stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date],
+                        start_date, end_date)
         return stats
     
     def month(self, year, month):
@@ -303,6 +316,8 @@ class Server(object):
         else:
             range_stats = self.get_slice(*range_stats).to_html(num_of_countries=10)
         
+        today = self.get_slice(date.today(), date.today())
+        
         return textwrap.dedent('''\
         <?xml version="1.0" encoding="UTF-8"?>
         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -424,6 +439,7 @@ class Server(object):
                                     <input type="submit" value="Update" />
                                 </form>
                             </fieldset>
+                            <b>Donations today: $%(today).2f</b><br />
                             %(range_stats)s
                         </td>
                     </tr>
@@ -432,6 +448,8 @@ class Server(object):
                 <div style="text-align:center">
                     <h3>Income trends for the last year</h3>
                     <img src="%(root)strend.png" alt="Income trends" />
+                    <h3>Income trends for the last 31 days</h3>
+                    <img src="%(root)smonth_trend.png" alt="Month income trend" />
                 </div>
             </body>
         </html>
@@ -442,6 +460,7 @@ class Server(object):
                   rc = 'checked="checked"' if period_type=="range" else '',
                   month_month=mmlist, month_year=mylist, year_year=yylist,
                   rl=rl, rr=rr, range_stats=range_stats, root=self.document_root,
+                  today=today.total
                   )
     
     @expose
@@ -456,6 +475,11 @@ class Server(object):
         cherrypy.response.headers['Content-Type'] = 'image/png'
         return open(self.TRENDS, 'rb').read()
     
+    @expose
+    def month_trend_png(self):
+        cherrypy.response.headers['Content-Type'] = 'image/png'
+        return open(self.MONTH_TRENDS, 'rb').read()
+    
     @expose
     def show(self, period_type='month', month_month='', month_year='', 
              year_year='', range_left='', range_right=''):
@@ -496,4 +520,4 @@ def main(args=sys.argv):
     return 0
 
 if __name__ == '__main__':
-    sys.exit(main())
\ No newline at end of file
+    sys.exit(main())
diff --git a/src/calibre/trac/plugins/Changelog.py b/src/calibre/trac/plugins/Changelog.py
index 05f1b4456f..8d02ebdd73 100644
--- a/src/calibre/trac/plugins/Changelog.py
+++ b/src/calibre/trac/plugins/Changelog.py
@@ -17,7 +17,7 @@ BZR_PATH = '/var/bzr/code/calibre/trunk'
 class ChangelogFormatter(blog.LogFormatter):
     
     supports_tags = True
-    supports_merge_revisions = True
+    supports_merge_revisions = False
     
     def __init__(self, num_of_versions=20):
         self.num_of_versions = num_of_versions
diff --git a/src/calibre/trac/plugins/download.py b/src/calibre/trac/plugins/download.py
index ca5ecabed4..6436aba448 100644
--- a/src/calibre/trac/plugins/download.py
+++ b/src/calibre/trac/plugins/download.py
@@ -11,7 +11,6 @@ from trac.util import Markup
 
 __appname__ = 'calibre'
 DOWNLOAD_DIR = '/var/www/calibre.kovidgoyal.net/htdocs/downloads'
-LINUX_INSTALLER = '/var/www/calibre.kovidgoyal.net/calibre/src/calibre/linux_installer.py'
 MOBILEREAD = 'https://dev.mobileread.com/dist/kovid/calibre/'
 
 class OS(dict):
@@ -114,7 +113,7 @@ class Download(Component):
         if req.path_info == '/download':
             return self.top_level(req)
         elif req.path_info == '/download_linux_binary_installer':
-            req.send(open(LINUX_INSTALLER).read().replace('%version', self.version_from_filename()), 'text/x-python')
+            req.send(LINUX_INSTALLER.replace('%version', self.version_from_filename()), 'text/x-python')
         else:
             match = re.match(r'\/download_(\S+)', req.path_info)
             if match:
@@ -240,3 +239,196 @@ If not, head over to <a href="http://calibre.kovidgoyal.net/wiki/Development#Tra
                     operating_systems=operating_systems, font_size='x-large', top_level=False)
         return 'download.html', data, None
                             
+
+LINUX_INSTALLER = r'''
+import sys, os, shutil, tarfile, subprocess, tempfile, urllib2, re, stat
+
+MOBILEREAD='https://dev.mobileread.com/dist/kovid/calibre/'
+
+class TerminalController:
+    BOL = ''             #: Move the cursor to the beginning of the line
+    UP = ''              #: Move the cursor up one line
+    DOWN = ''            #: Move the cursor down one line
+    LEFT = ''            #: Move the cursor left one char
+    RIGHT = ''           #: Move the cursor right one char
+    
+    # Deletion:
+    CLEAR_SCREEN = ''    #: Clear the screen and move to home position
+    CLEAR_EOL = ''       #: Clear to the end of the line.
+    CLEAR_BOL = ''       #: Clear to the beginning of the line.
+    CLEAR_EOS = ''       #: Clear to the end of the screen
+    
+    # Output modes:
+    BOLD = ''            #: Turn on bold mode
+    BLINK = ''           #: Turn on blink mode
+    DIM = ''             #: Turn on half-bright mode
+    REVERSE = ''         #: Turn on reverse-video mode
+    NORMAL = ''          #: Turn off all modes
+    
+    # Cursor display:
+    HIDE_CURSOR = ''     #: Make the cursor invisible
+    SHOW_CURSOR = ''     #: Make the cursor visible
+    
+    # Terminal size:
+    COLS = None          #: Width of the terminal (None for unknown)
+    LINES = None         #: Height of the terminal (None for unknown)
+    
+    # Foreground colors:
+    BLACK = BLUE = GREEN = CYAN = RED = MAGENTA = YELLOW = WHITE = ''
+    
+    # Background colors:
+    BG_BLACK = BG_BLUE = BG_GREEN = BG_CYAN = ''
+    BG_RED = BG_MAGENTA = BG_YELLOW = BG_WHITE = ''
+    
+    _STRING_CAPABILITIES = """
+    BOL=cr UP=cuu1 DOWN=cud1 LEFT=cub1 RIGHT=cuf1
+    CLEAR_SCREEN=clear CLEAR_EOL=el CLEAR_BOL=el1 CLEAR_EOS=ed BOLD=bold
+    BLINK=blink DIM=dim REVERSE=rev UNDERLINE=smul NORMAL=sgr0
+    HIDE_CURSOR=cinvis SHOW_CURSOR=cnorm""".split()
+    _COLORS = """BLACK BLUE GREEN CYAN RED MAGENTA YELLOW WHITE""".split()
+    _ANSICOLORS = "BLACK RED GREEN YELLOW BLUE MAGENTA CYAN WHITE".split()
+    
+    def __init__(self, term_stream=sys.stdout):
+        # Curses isn't available on all platforms
+        try: import curses
+        except: return
+        
+        # If the stream isn't a tty, then assume it has no capabilities.
+        if not hasattr(term_stream, 'isatty') or not term_stream.isatty(): return
+        
+        # Check the terminal type.  If we fail, then assume that the
+        # terminal has no capabilities.
+        try: curses.setupterm()
+        except: return
+        
+        # Look up numeric capabilities.
+        self.COLS = curses.tigetnum('cols')
+        self.LINES = curses.tigetnum('lines')
+        
+        # Look up string capabilities.
+        for capability in self._STRING_CAPABILITIES:
+            (attrib, cap_name) = capability.split('=')
+            setattr(self, attrib, self._tigetstr(cap_name) or '')
+        
+        # Colors
+        set_fg = self._tigetstr('setf')
+        if set_fg:
+            for i,color in zip(range(len(self._COLORS)), self._COLORS):
+                setattr(self, color, curses.tparm(set_fg, i) or '')
+        set_fg_ansi = self._tigetstr('setaf')
+        if set_fg_ansi:
+            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
+                setattr(self, color, curses.tparm(set_fg_ansi, i) or '')
+        set_bg = self._tigetstr('setb')
+        if set_bg:
+            for i,color in zip(range(len(self._COLORS)), self._COLORS):
+                setattr(self, 'BG_'+color, curses.tparm(set_bg, i) or '')
+        set_bg_ansi = self._tigetstr('setab')
+        if set_bg_ansi:
+            for i,color in zip(range(len(self._ANSICOLORS)), self._ANSICOLORS):
+                setattr(self, 'BG_'+color, curses.tparm(set_bg_ansi, i) or '')
+    
+    def _tigetstr(self, cap_name):
+        # String capabilities can include "delays" of the form "$<2>".
+        # For any modern terminal, we should be able to just ignore
+        # these, so strip them out.
+        import curses
+        cap = curses.tigetstr(cap_name) or ''
+        return re.sub(r'\$<\d+>[/*]?', '', cap)
+    
+    def render(self, template):
+        return re.sub(r'\$\$|\${\w+}', self._render_sub, template)
+    
+    def _render_sub(self, match):
+        s = match.group()
+        if s == '$$': return s
+        else: return getattr(self, s[2:-1])
+
+class ProgressBar:
+    BAR = '%3d%% ${GREEN}[${BOLD}%s%s${NORMAL}${GREEN}]${NORMAL}\n'
+    HEADER = '${BOLD}${CYAN}%s${NORMAL}\n\n'
+    
+    def __init__(self, term, header):
+        self.term = term
+        if not (self.term.CLEAR_EOL and self.term.UP and self.term.BOL):
+            raise ValueError("Terminal isn't capable enough -- you "
+            "should use a simpler progress dispaly.")
+        self.width = self.term.COLS or 75
+        self.bar = term.render(self.BAR)
+        self.header = self.term.render(self.HEADER % header.center(self.width))
+        self.cleared = 1 #: true if we haven't drawn the bar yet.
+        
+    def update(self, percent, message=''):
+        if isinstance(message, unicode):
+            message = message.encode('utf-8', 'ignore')
+        if self.cleared:
+            sys.stdout.write(self.header)
+            self.cleared = 0
+        n = int((self.width-10)*percent)
+        msg = message.center(self.width)
+        sys.stdout.write(
+        self.term.BOL + self.term.UP + self.term.CLEAR_EOL +
+        (self.bar % (100*percent, '='*n, '-'*(self.width-10-n))) +
+        self.term.CLEAR_EOL + msg)
+        sys.stdout.flush()
+    
+    def clear(self):
+        if not self.cleared:
+            sys.stdout.write(self.term.BOL + self.term.CLEAR_EOL +
+            self.term.UP + self.term.CLEAR_EOL +
+            self.term.UP + self.term.CLEAR_EOL)
+            self.cleared = 1
+
+def download_tarball():
+    try:
+        pb  = ProgressBar(TerminalController(sys.stdout), 'Downloading calibre...')
+    except ValueError:
+        print 'Downloading calibre...'
+        pb = None
+    local = 'calibre-test.tar.bz2'
+    src = open(local) if os.access(local, os.R_OK) else urllib2.urlopen(MOBILEREAD+'calibre-%version-i686.tar.bz2')
+    if hasattr(src, 'info'):
+            size = int(src.info()['content-length'])
+    else:
+        src.seek(0, 2)
+        size = src.tell()
+        src.seek(0)
+    f = tempfile.NamedTemporaryFile()
+    while f.tell() < size:
+        f.write(src.read(4*1024))
+        percent = f.tell()/float(size)
+        if pb is not None:
+            pb.update(percent)
+        else:
+            print '%d%%, '%int(percent*100),
+    f.seek(0)
+    return f
+
+def extract_tarball(tar, destdir):
+    print 'Extracting application files...'
+    if hasattr(tar, 'read'):
+        try:
+            tarfile.open(fileobj=tar, mode='r').extractall(destdir)
+        except: # tarfile.py on Fedora 9 is buggy
+            subprocess.check_call(['tar', 'xjf', tar.name, '-C', destdir])
+    else:
+        tarfile.open(tar, 'r').extractall(destdir)
+
+def main():
+    defdir = '/opt/calibre'
+    destdir = raw_input('Enter the installation directory for calibre (Its contents will be deleted!)[%s]: '%defdir).strip()
+    if not destdir:
+        destdir = defdir
+    destdir = os.path.abspath(destdir)
+    if os.path.exists(destdir):
+        shutil.rmtree(destdir)
+    os.makedirs(destdir)
+    
+    f = download_tarball()
+    
+    print 'Extracting files to %s ...'%destdir
+    extract_tarball(f, destdir)
+    pi = os.path.join(destdir, 'calibre_postinstall')
+    subprocess.call(pi, shell=True)
+    return 0
+'''
diff --git a/src/calibre/trac/plugins/templates/pyinstaller.html b/src/calibre/trac/plugins/templates/pyinstaller.html
index 901ba16d75..f85b3b9499 100644
--- a/src/calibre/trac/plugins/templates/pyinstaller.html
+++ b/src/calibre/trac/plugins/templates/pyinstaller.html
@@ -14,7 +14,7 @@
 
     <div id="content" class="binary">
       <h1>Download $app for Linux</h1>
-      <p>This binary package is compatible with most recent linux distributions running on Intel 32 bit CPUs. It needs testing on 64 bit CPUs. </p>
+      <p>This binary package is compatible with most recent linux distributions running on Intel 32 bit CPUs. It needs testing on 64 bit CPUs. There have been reports of its working on some 64bit machines. </p>
       <p>
       <img width="50" height="50" style="border:1px red solid" src="${href.chrome('/dl/images/binary_logo.png')}" /> 
       (Version: $version <a href="/wiki/Changelog">Changelog</a>)
@@ -37,7 +37,7 @@
       <h2>Note</h2>
       <div class="note">
       <ul>
-      <li>This installer is very new and has only been tested ona  couple of systems, so if you encounter
+      <li>This installer is very new and has only been tested on a couple of systems, so if you encounter
       problems, please report them.</li>
       <li>You shoud have help2man and xdg-utils installed on your system.</li>
       </ul>
diff --git a/src/calibre/translations/bg.po b/src/calibre/translations/bg.po
index 6c830fea96..c874dca158 100644
--- a/src/calibre/translations/bg.po
+++ b/src/calibre/translations/bg.po
@@ -6,56 +6,230 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-05-24 06:23+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -69,7 +243,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -77,17 +251,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -96,38 +270,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -135,134 +309,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +395,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +414,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +513,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -437,7 +577,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr ""
 
@@ -678,11 +818,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -693,118 +833,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -845,95 +985,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1132,17 +1272,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1161,25 +1301,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1188,23 +1328,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1283,7 +1423,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1435,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,7 +1448,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1376,6 +1516,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1411,9 +1563,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1421,8 +1573,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1436,6 +1588,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1511,83 +1664,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1817,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,6 +2021,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1811,7 +2076,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1865,25 +2130,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,7 +2158,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1934,22 +2199,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1964,14 +2229,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,14 +2257,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2012,7 +2277,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,7 +2286,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2030,8 +2295,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2444,91 +2709,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2590,93 +2859,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2826,25 +3114,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,7 +3144,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3086,52 +3374,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3160,7 +3458,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3483,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3199,7 +3497,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3505,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3666,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,29 +4118,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3912,7 +4283,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3936,109 +4307,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4047,31 +4422,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4479,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4326,79 +4710,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4418,13 +4810,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4437,28 +4829,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +4858,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,7 +4868,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4573,113 +4965,113 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
diff --git a/src/calibre/translations/ca.po b/src/calibre/translations/ca.po
index 935ea65101..e58ac9d920 100644
--- a/src/calibre/translations/ca.po
+++ b/src/calibre/translations/ca.po
@@ -10,55 +10,229 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-05-24 06:21+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -72,7 +246,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -80,17 +254,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -99,38 +273,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -138,134 +312,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Desconegut"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -276,8 +398,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -290,93 +417,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -389,28 +516,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Indique el tĆ­tol. Per defecte: nom_del_fitxer."
@@ -442,7 +582,7 @@ msgstr "Clau d'ordre per a l'autor"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Editorial"
 
@@ -724,11 +864,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -739,118 +879,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -891,95 +1031,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1178,17 +1318,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "TĆ­Ā­tol"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Autor(s)"
 
@@ -1207,25 +1347,25 @@ msgstr "Categoria"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Comentaris"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Etiquetes"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "SĆØries"
@@ -1234,23 +1374,23 @@ msgstr "SĆØries"
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1329,7 +1469,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1341,11 +1481,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1354,7 +1494,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "Directoris emprats amb freqĆ¼ĆØncia"
 
@@ -1422,6 +1562,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1457,9 +1609,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "CamĆ­"
 
@@ -1467,8 +1619,8 @@ msgstr "CamĆ­"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formats"
@@ -1482,6 +1634,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1557,83 +1710,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "UbicaciĆ³ de la base de dades no vĆ lida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Cal que siga un directori."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "UbicaciĆ³ de la base de dades no vĆ lida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "UbicaciĆ³ de la base de dades no vĆ lida.<br>No es pot escriure "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "ConfiguraciĆ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Cerca la nova ubicaciĆ³ de la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1649,189 +1863,202 @@ msgstr "Cerca la nova ubicaciĆ³ de la base de dades"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "Afegir el directori al llistat de directoris freqĆ¼ents"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Elimiar el directori al llistat de directoris freqĆ¼ents"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "Nom d'&usuari:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&Contrasenya:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1840,6 +2067,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "ERROR"
@@ -1857,7 +2122,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadades"
 
@@ -1911,25 +2176,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "No pot llegir-se"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "No tens permissos per a llegir l'arxiu: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Error llegint l'arxiu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Error llegint de l'arxiu: <br /><b>"
 
@@ -1939,7 +2204,7 @@ msgid " is not a valid picture"
 msgstr " no Ć©s una imatge vĆ lida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "No puc convertir-lo"
 
@@ -1980,22 +2245,22 @@ msgid "Book Cover"
 msgstr "Coberta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Canvia la imatge de la &coberta:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Cerca una imatge per a utilitzar com a coberta d'aquest llibre."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2010,14 +2275,14 @@ msgstr "Canvia el tĆ­Ā­tol del llibre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Autor(s): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2039,14 +2304,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Editorial: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Canvia l'editorial del llibre"
@@ -2059,7 +2324,7 @@ msgstr "Etique&tes: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2070,7 +2335,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&SĆØries:"
@@ -2079,8 +2344,8 @@ msgstr "&SĆØries:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2504,25 +2769,25 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Editar Meta-informaciĆ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta-informaciĆ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "&Ordena autors: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2531,66 +2796,70 @@ msgstr ""
 "Especifiqueu com s'ha d'ordenar l'autor(s) d'aquest llibre. Per "
 "exemple,ordena Vicent A. EstellƩs com a EstellƩs, Vicent A."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&ValoraciĆ³:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Valora aquest llibre: 0-5 estreles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " estreles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "Afe&geix les etiquetes: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No puc aconseguir la coberta.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "No puc aconseguir la coberta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "No puc aconseguir la coberta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Cal especificar un ISBN correcte per al llibre."
 
@@ -2653,93 +2922,112 @@ msgstr ""
 msgid "Password needed"
 msgstr "Es necessita una contrasenya."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2889,25 +3177,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2919,7 +3207,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3149,52 +3437,62 @@ msgstr "En espera..."
 msgid "Working"
 msgstr "EstĆ  treballant..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "GrandĆ ria (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "ValoraciĆ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Cap"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Llibre <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Marca de temps"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3223,7 +3521,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No</b> s'han trobat coincidĆØncies per al text \"<i>%s</i>\"."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "No s'han trobat coincidĆØncies"
 
@@ -3248,12 +3546,12 @@ msgid "Previous Page"
 msgstr "PĆ gina anterior"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "Precedent"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "SegĆ¼ent"
 
@@ -3262,7 +3560,7 @@ msgid "Next match"
 msgstr "SegĆ¼ent coincidĆØncia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Obre l'eBook"
 
@@ -3270,144 +3568,152 @@ msgstr "Obre l'eBook"
 msgid "Configure"
 msgstr "Configura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Error en la comunicaciĆ³ amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "Envia a la memĆ²ria interna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "Envia a la targeta de memĆ²ria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Edita metadades individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Edita metadades en massa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Desa al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Mostra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Converteix individualment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Converteix tots"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3423,199 +3729,240 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "Sense espai al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr "<p>No puc desar llibres al dispositiu perquĆØ no hi ha espai restant "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "No puc editar les meta-dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Cap llibre seleccionat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "No puc desar al disc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Cap llibre seleccionat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "No puc mostrar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "No puc configurar-lo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "No puc configurar-lo amb treballs processant-se"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "No puc moure la base de dades"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Error comunicant amb el dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -3623,105 +3970,105 @@ msgstr ""
 "Hi ha hagut un error de comunicaciĆ³ amb el dispositiu. Lleve, torne a "
 "connectar el dispositiu i torne a iniciar el programa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "Re&cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -3729,7 +4076,7 @@ msgstr ""
 "Recerca llibres pel tĆ­Ā­tol o l'autor. <br><br>Els espais entre paraules es "
 "substitueixen per AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -3737,75 +4084,99 @@ msgstr ""
 "Recerca llibres pel tĆ­Ā­tol, l'autor, l'editorial, les etiquetes i els "
 "comentaris<br><br>Els espais entre paraules es substitueixen per AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Reinicialitza la recerca rĆ pida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "Afegeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Suprimeix llibres"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Esborra"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Edita la meta-informaciĆ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "Envia al dispositiu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Recull notĆ­Ā­cies (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "Converteix Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3816,29 +4187,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Treballs:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3981,7 +4352,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4005,109 +4376,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4116,35 +4491,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Biblioteca"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"El Sony Reader\n"
-"%s estĆ  disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"La targeta\n"
-"%s estĆ  disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4172,6 +4548,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4399,79 +4779,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Creat per "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4491,13 +4879,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4510,28 +4898,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4539,7 +4927,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4549,7 +4937,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4646,114 +5034,114 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -4809,6 +5197,23 @@ msgstr ""
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Els canvis s'ignoren fins que el re-inicieu."
 
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "El Sony Reader\n"
+#~ "%s estĆ  disponible"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "La targeta\n"
+#~ "%s estĆ  disponible"
+
 #~ msgid "%s is not available in LRF format. Please convert it first."
 #~ msgstr "%s no estĆ  disponible en LRF. Ha de ser convertir primer."
 
diff --git a/src/calibre/translations/cs.po b/src/calibre/translations/cs.po
index bc7089b30b..50dd953fa4 100644
--- a/src/calibre/translations/cs.po
+++ b/src/calibre/translations/cs.po
@@ -7,32 +7,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-10-23 12:18+0000\n"
 "Last-Translator: raduz <raduzator@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "NeznĆ”mĆ½"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Disk %s nebyl nalezen. Zkuste restart."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Do čtecĆ­ho zaÅ™Ć­zenĆ­ nenĆ­ vložena Å¾Ć”dnĆ” paměńovĆ” karta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "NastavenĆ­ pro převod do formĆ”tu EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -40,7 +214,7 @@ msgstr ""
 "NĆ”zev vĆ½slednĆ©ho EPUB souboru. NenĆ­-li zadĆ”n, bude odvozen z nĆ”zvu vstupnĆ­ho "
 "souboru."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -50,17 +224,17 @@ msgstr ""
 "EPUB nezĆ”vislĆ©ho na na zaÅ™Ć­zenĆ­ zadejte Å½Ć”dnĆ½. Profiul je určen pro omezenĆ­ "
 "specifickĆ” pro danĆ© zaÅ™Ć­zenĆ­. Možnosti jsou: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "NastavenĆ­ autodetekce struktury dokumentu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -84,7 +258,7 @@ msgstr ""
 "Tutorial \n"
 "v uživatelskĆ© pÅ™Ć­ručce calibre.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -96,11 +270,11 @@ msgstr ""
 "\"Å¾Ć”dnĆ©\" vypne označovĆ”nĆ­ kapitol,volba \"obojĆ­\" použije pro označovĆ”nĆ­ "
 "jak zlomy strĆ”nky, tak ÄĆ”ry."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr "Cesta k titulnƭ strƔnce pro tuto knihu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
@@ -108,7 +282,7 @@ msgstr ""
 "PouÅ¾Ć­t titulnĆ­ stranu nalezenou ve zdrojovĆ©m souboru namĆ­sto zadanĆ© titulnĆ­ "
 "strƔnky."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -117,7 +291,7 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
@@ -127,19 +301,17 @@ msgstr ""
 "Standardně nastaveno: %default. Å˜Ć”dky jsou přidĆ”ny do obsahu pouze v tom "
 "pÅ™Ć­padě, kdy je detekovĆ”no mĆ©ně kapitol než je zadĆ”no v --toc-treshold."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "NepřidĆ”vat automaticky detekovanĆ© kapitoly do obsahu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
-"Pokud je detekovĆ”no mĆ©ně kapitol než je tato hodnota, budou odkazy přidĆ”ny "
-"do obsahu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
@@ -149,7 +321,7 @@ msgstr ""
 "na Ćŗrovni jedna. Je-li zadĆ”n, mĆ” přednost před ostatnĆ­mi formami auto-"
 "detekce."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
@@ -158,7 +330,7 @@ msgstr ""
 "VĆ½raz XPath, kterĆ½ určuje vÅ”echny tagy, kterĆ© by měly bĆ½t přidĆ”ny do obsahu "
 "na Ćŗrovni dvě. KaždĆ” položka je přidĆ”na pod předchozĆ­ položku Ćŗrovně jedna."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -170,7 +342,7 @@ msgstr ""
 "kterĆ©m je soubor umĆ­stěn. Pro popis formĆ”tu NCX viz. "
 "http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
@@ -180,27 +352,27 @@ msgstr ""
 "automaticky vygenerovanĆ½m. Je-li zapnuta tato volba, je vždy použit "
 "automaticky generovanĆ½ obsah."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr "RozvrženĆ­ ovlĆ”dacĆ­ strĆ”nky."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr "Nastavƭ hornƭ okraj v bodech. Standardně je %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr "Nastavƭ dolnƭ okraj v bodech. Standardně je %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr "NastavĆ­ levĆ½ okraj v bodech. Standardně je %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr "NastavĆ­ pravĆ½ okraj v bodech. Standardně je %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
@@ -208,7 +380,7 @@ msgstr ""
 "Velikost zƔkladnƭho fontu v bodech. Standardnƭ je %defaultpt. Je-li zadƔno "
 "0, bude vypnuto Å”kĆ”lovĆ”nĆ­ fontÅÆ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
@@ -216,7 +388,7 @@ msgstr ""
 "Odstranit mezery mezi odstavci. Nebude fungovat, pokud zdrojovĆ½ soubor "
 "mezery mezi odstavci vyžaduje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
@@ -227,92 +399,36 @@ msgstr ""
 "vybĆ­ranĆ­ sourozencÅÆ. ZvolenĆ­ tĆ©to funkce vĆ½razně zpomalĆ­ zpracovĆ”nĆ­ velkĆ½ch "
 "HTML souborÅÆ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr "Vytiskne generovanĆ½ OPF soubor na standardnĆ­ vĆ½stup."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr "Vytiskne generovanĆ½ NCX soubor na standardnĆ­ vĆ½stup."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr "Zachovat mezisoubory při zpracovĆ”vĆ”nĆ­ nĆ”strojem html2epub"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr "Extrahovat obsah vytvořenĆ©ho EPUB souboru do určenĆ©ho adresĆ”Å™e."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "NeznĆ”mĆ½"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
-"%%prog [volby] soubor\n"
-"\n"
-"Převede kterĆ½koliv z velkĆ©ho množstvĆ­ ebook formĆ”tÅÆ do epub souboru. "
-"PodporovanƩ  formƔty jsou: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr "V archivu nebyl nalezen Å¾Ć”dnĆ½ ebook."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -323,8 +439,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "MusĆ­te specifikovat vstupnĆ­ HTML soubor."
 
@@ -338,7 +459,7 @@ msgid ""
 msgstr ""
 "Nepodařilo se najit vhodnĆ½ bod pro rozdělenĆ­: %s Velikost podstromu:%d KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
@@ -346,23 +467,23 @@ msgstr ""
 "\t\tPÅ™Ć­liÅ” mnoho tagÅÆ. Přerozděleno bez zachovĆ”nĆ­ struktury. To mÅÆže "
 "zpÅÆsobit nesprĆ”vnĆ© zobrazenĆ­."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "ZpracovanƩ HTML bylo zapsano do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Volby pro nastavenĆ­ prÅÆchodu HTML souborem."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "VĆ½stupnĆ­ adresĆ”Å™. Standardně je aktuĆ”lnĆ­ adresĆ”Å™."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "KĆ³dovĆ”nĆ­ znakovĆ© sady HTML souborÅÆ. Standardně je autodetekovĆ”na."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -370,11 +491,11 @@ msgstr ""
 "VĆ½stuo je uložen do ZIP souboru. Pokud je zvolena tato volba, položka --"
 "output by měly obsahovat nĆ”zev souboru, nikoliv adresĆ”Å™e."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Nastavuje nĆ”sledovanĆ­ odkazÅÆ v HTML souborech."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -382,7 +503,7 @@ msgstr ""
 "Nastavuje prochĆ”zenĆ­ HTML souborÅÆ do Å”Ć­Å™ky. NormĆ”lně je nastaveno prochĆ”zenĆ­ "
 "do hloubky."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -391,39 +512,39 @@ msgstr ""
 "nezĆ”pornĆ© čƭslo. 0 znamenĆ”, že nejsou nĆ”sledovĆ”ny Å¾Ć”dnĆ© odkazy obsaženĆ© v "
 "HTML souboru."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Nastavit metadata pro generovanou knihu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Zadat nĆ”zev. Standardně je autodetekovĆ”n."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "Autor/ři knihy v seznamu oddělenĆ©m ÄĆ”rkou."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "TĆ©ma(ta) knihy jako seznam oddělenĆ½ ÄĆ”rkami."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr "Zadat vydavatele tƩto knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr "Shrnutƭ tƩto knihy."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr "NahrƔt metadata ze zadanƩho OPF souboru."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "NastavenĆ­ užitečnĆ” pro odlaďovĆ”nĆ­."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -431,11 +552,11 @@ msgstr ""
 "Zobrazovat vĆ­ce informacĆ­ při zpracovĆ”nĆ­. MÅÆže bĆ½t zadĆ”no několikrĆ”t pro "
 "zvětÅ”enĆ­ množstvĆ­ informacĆ­."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "VĆ½stupnĆ­ HTML je zobrazeno v podobě lĆ©pe čitelnĆ© pro člověka."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -455,28 +576,41 @@ msgstr ""
 "skripty atd. \n"
 "Pokud je zadĆ”n OPF soubor, je použit seznam souborÅÆ v elementu <spine>.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr "%prog [options] LIT_soubor"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr "VĆ½stupnĆ­ adresĆ”Å™. Standardně je použit aktuĆ”lnĆ­ adresĆ”Å™."
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr "%prog [options] LIT_soubor"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr "VĆ½stupnĆ­ adresĆ”Å™. Standardně je použit aktuĆ”lnĆ­ adresĆ”Å™."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "UžitečnĆ© pro laděnĆ­ programu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB kniha vytvořena v"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "NastavenĆ­ nĆ”zvu. Standardně: nĆ”zev souboru"
@@ -508,7 +642,7 @@ msgstr "TÅ™Ć­dĆ­cĆ­ klƭč pro autora"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Vydavatel"
 
@@ -761,11 +895,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -776,118 +910,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -928,95 +1062,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1215,17 +1349,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1244,25 +1378,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1271,23 +1405,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1366,7 +1500,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1378,11 +1512,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1391,7 +1525,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1459,6 +1593,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1494,9 +1640,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1504,8 +1650,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1519,6 +1665,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1594,83 +1741,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1686,189 +1894,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1877,6 +2098,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1894,7 +2153,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1948,25 +2207,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1976,7 +2235,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -2017,22 +2276,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2047,14 +2306,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2075,14 +2334,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2095,7 +2354,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2104,7 +2363,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2113,8 +2372,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2527,91 +2786,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2673,93 +2936,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2909,25 +3191,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2939,7 +3221,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3169,52 +3451,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3243,7 +3535,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3268,12 +3560,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3282,7 +3574,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3290,144 +3582,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3443,383 +3743,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3830,29 +4195,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3995,7 +4360,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4019,109 +4384,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4130,31 +4499,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4182,6 +4556,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4409,79 +4787,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4501,13 +4887,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4520,28 +4906,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4549,7 +4935,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4559,7 +4945,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4656,113 +5042,131 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
+
+#~ msgid ""
+#~ "If fewer than this number of chapters is detected, then links are added to "
+#~ "the Table of Contents."
+#~ msgstr ""
+#~ "Pokud je detekovĆ”no mĆ©ně kapitol než je tato hodnota, budou odkazy přidĆ”ny "
+#~ "do obsahu."
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [volby] soubor\n"
+#~ "\n"
+#~ "Převede kterĆ½koliv z velkĆ©ho množstvĆ­ ebook formĆ”tÅÆ do epub souboru. "
+#~ "PodporovanƩ  formƔty jsou: %s\n"
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 9472589f26..0e0b852920 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -7,33 +7,220 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-26 23:34+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2009-01-04 01:11+0000\n"
 "Last-Translator: S. Dorscht <Unknown>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Macht gar nix"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Basis"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Datei Typ"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Metadaten Reader"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Metadaten Writer"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"Folge alle lokalen Verweise in einer HTML Datei und erstelle eine ZIP Datei "
+"mit allen verlinkten Dateien. Dieses Plugin lƤuft immer, wenn sie eine HTML "
+"Datei zur Bibliothek hinzufĆ¼gen."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Metadaten aus %s Dateien lesen"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr "Cover aus Comic Dateien extrahieren"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr "Metadaten in EPUB Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr "Metadaten in LRF Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr "Metadaten in RTF Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "Installierte Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr "Mapping fĆ¼r Dateityp Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr "Lokale Plugin Anpassung"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Ausgeschaltene Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr "Kein gĆ¼ltiges Plugin gefunden in "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr "Staren des Plugins %s schlug fehl. Traceback:"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+"    %prog options\n"
+"    \n"
+"    Calibre anpassen durch das Laden externer Plugins.\n"
+"    "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+"Plugin hinzufĆ¼gen durch die Angabe des Pfads zur ZIP Datei, die das Plugin "
+"enthƤlt."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+"Anpassbares Plugin entfernen. Dies hat keinen Einfluss auf festinstallierte "
+"Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+"Plugin anpassen. Geben Sie den Namen des Pugins und die Anpassung durch ein "
+"Komma getrennt an."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr "Installierte Plugins auflisten"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr "GewƤhltes Plugin einschalten"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr "GewƤhltes Plugin ausschalten"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Konnte das Laufwerk %s nicht finden. Versuchen Sie einen Neustart."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Im Reader ist keine Speicherkarte eingesteckt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Einstellungen zur Kontrolle der Konvertierung zu EPUB Dateien"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -41,7 +228,7 @@ msgstr ""
 "EPUB Ausgabedatei. Falls nicht angegeben, wird es vom ursprĆ¼nglichen "
 "Dateinamen abgeleitet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -52,7 +239,7 @@ msgstr ""
 "gerƤtespezifische EinschrƤnkungen der EPUB Datei verwendet. Es gibt folgende "
 "Wahlmƶglichkeiten: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
@@ -60,11 +247,11 @@ msgstr ""
 "Entweder der Pfad zu einem CSS Stylesheet oder original CSS. Dieses CSS "
 "Ć¼berschreibt alle existierenden CSS Angaben in den Ursprungsdateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Kontrolle der automatischen Erkennung der Dokumentstruktur."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -88,7 +275,7 @@ msgstr ""
 "dieses Features gibt es im\n"
 "XPath Tutorial im calibre User Manual.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -101,11 +288,11 @@ msgstr ""
 "Kapitelmarkierung aus und der Wert \"both\" verwendet sowohl SeitenumbrĆ¼che "
 "als auch Linien zur Kapitelmarkierung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr "Pfad zum Umschlagbild, das fĆ¼r dieses Buch verwendet werden soll"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
@@ -113,7 +300,7 @@ msgstr ""
 "Verwendet bevorzugt das aus der Ursprungsdatei gewonnene Umschlagbild "
 "anstatt des angegebenen Umschlagbildes."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -127,7 +314,7 @@ msgstr ""
 "versuchen\n"
 "ein Inhaltsverzeichnis automatisch zu erstellen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
@@ -138,19 +325,19 @@ msgstr ""
 "VerknĆ¼pfungen werden nur dann zum Inhaltsverzeichnis hinzugefĆ¼gt, wenn "
 "weniger Kapitel als in --toc-threshold angegeben erkannt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Automatisch erkannte Kapitel nicht zum Inhaltsverzeichnis hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
-"Falls weniger Kapitel erkannt werden als in dieser Zahl angegeben, dann "
-"werden VerknĆ¼pfungen zum Inhaltsverzeichnis hinzugefĆ¼gt."
+"Wurden weniger Kapitel als hier angegeben erkannt, werden VerknĆ¼pfungen zum "
+"Inhaltsverzeichnis hinzugefĆ¼gt. Voreinstellung: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
@@ -160,7 +347,7 @@ msgstr ""
 "Ebene 1 hinzugefĆ¼gt werden sollen. Falls dies angegeben wird, erhƤlt es "
 "PrioritƤt Ć¼ber andere Formen der automatischen Erkennung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
@@ -170,7 +357,7 @@ msgstr ""
 "Ebene 2 hinzugefĆ¼gt werden sollen. Jeder Eintrag wird unter dem vorherigen "
 "Ebene 1 Eintrag angelegt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -183,7 +370,7 @@ msgstr ""
 "NCX Format erhalten Sie unter http://www.niso.org/workrooms/daisy/Z39-86-"
 "2005.html#NCX."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
@@ -193,31 +380,31 @@ msgstr ""
 "enthƤlt, dieses anstelle des automatisch erkannten verwendet. Mit dieser "
 "Option wird immer das automatisch erkannte Inhaltsverzeichnis verwendet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr "Einstellungen des Seitenlayouts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 "Oberen Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 "Unteren Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 "Linken Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 "Rechten Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
@@ -225,7 +412,7 @@ msgstr ""
 "Die BezugsschriftgrĆ¶ĆŸe in Punkt. Die Voreinstellung ist %defaultpt. Geben "
 "Sie 0 an, um die GrĆ¶ĆŸenƤnderung von Schriften auszuschalten."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
@@ -233,7 +420,7 @@ msgstr ""
 "Abstand zwischen Paragrafen entfernen. Funktioniert nicht, falls die "
 "Ursprungsdatei AbstƤnde zwischen Paragrafen erzwingt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
@@ -244,94 +431,42 @@ msgstr ""
 "verwenden. Diese Option verlangsamt extrem die Verarbeitung von groƟen HTML "
 "Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr "Erstellte OPF Datei nach stdout ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr "Erstellte NCX Datei nach stdout ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr "Zwischendateien wƤhrend des Verarbeitens mit html2epub beibehalten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 "Den Inhalt der erstellten EPUB Datei in das angegebene Verzeichnis "
 "extrahieren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
-"%%prog [options] Dateiname\n"
+"%%prog [options] filename\n"
 "\n"
-"Konvertiert eine groƟe Anzahl von eBook Formaten in eine EPUB Datei. "
-"UnterstĆ¼tzte Formate: %s\n"
+"Konvertiert verschiedenste eBook Formate in eine %s Datei. UnterstĆ¼tzte "
+"Formate: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr "Konnte kein eBook im Archiv finden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -349,8 +484,13 @@ msgstr ""
 "VerknĆ¼pfungen aus dem\n"
 "<spine> Element der OPF Datei verwendet.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr "Ausgabe geschrieben nach "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "Geben Sie eine Eingabedatei im HTML Format an."
 
@@ -365,7 +505,7 @@ msgstr ""
 "Konnte keinen vernĆ¼nftige Stelle zur Trennung finden: %s UnterbaumgrĆ¶ĆŸe: %d "
 "KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
@@ -373,25 +513,25 @@ msgstr ""
 "\t\tZu viel Textauszeichnung. Wieder-Aufteilung ohne Bewahrung der Struktur. "
 "Dies kann zu falschem Rendering fĆ¼hren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "Verarbeitetes HTML wurde geschrieben in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Einstellungen zur Kontrolle der Durchforstung von HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist das aktuelle Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Zeichenkodierung fĆ¼r HTML Dateien. Die Voreinstellung ist automatisches "
 "Erkennen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -399,11 +539,11 @@ msgstr ""
 "Erstellt die Ausgabe in eine ZIP Datei. Wird diese Option angegeben, sollte -"
 "-output der Name einer Datei und nicht eines Verzeichnisses sein."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Kontrolliert die Verfolgung von VerknĆ¼pfungen in HTML Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -411,7 +551,7 @@ msgstr ""
 "Durchforstet VerknĆ¼pfungen in HTML Dateien zuerst in die Breite. "
 "Normalerweise werden sie zuerst in die Tiefe durchforstet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -420,39 +560,39 @@ msgstr ""
 "Dateien. Darf nicht negativ sein. 0 gibt an, dass keine VerknĆ¼pfungen in der "
 "ursprĆ¼nglichen HTML Datei verfolgt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Geben Sie die Metadaten des erstellten eBooks an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Geben Sie den Titel an. Voreinstellung ist automatische Ermittlung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "Autor(en) des eBooks, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Das Thema dieses Buches, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr "Geben Sie den Herausgeber dieses Buches an."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr "InhaltsĆ¼bersicht dieses Buches."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr "Metadaten aus der angegebenen OPF Datei laden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Hilfreiche Einstellungen zur Fehlersuche"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -460,13 +600,13 @@ msgstr ""
 "Noch ausfĆ¼hrlicher bei der weiteren Verarbeitung vorgehen. Kann zur "
 "VergrĆ¶ĆŸerung der AusfĆ¼hrlichkeit mehrfach angegeben werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Ausgabe HTML ist \"hĆ¼bsch gedruckt\" zur einfacheren Analyse durch "
 "menschliche Wesen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -488,30 +628,43 @@ msgstr ""
 "in ihrem <spine> Element\n"
 "verwendet.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr "Erstelle LIT Datei aus EPUB..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist aktuelles Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
 "Lesbares Format der extrahierten Textauszeichnung. Kƶnnte sinnvolle "
 "FreirƤume abƤndern."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Hilfreich bei der Fehlersuche."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB eBook erstellt in"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr "%prog [options] OPFFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr "Ausgabedatei. Voreinstellung stammt aus dem Namen der Eingabedatei."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Geben Sie den Titel an. Voreinstellung: Dateiname."
@@ -543,7 +696,7 @@ msgstr "Sortierung nach Autor"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Herausgeber"
 
@@ -863,11 +1016,11 @@ msgstr ""
 "cp-1252. Eine andere gebrƤuchliche Alternative ist utf-8. In der "
 "Voreinstellung wird versucht, die Kodierung zu erraten."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr "Konvertierung von %s nach LRF wird nicht unterstĆ¼tzt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -886,19 +1039,19 @@ msgstr ""
 "ZIP Archive, indem es nach einem eBook im Archiv sucht.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Keine Datei zur Konvertierung angegeben."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "%s gerendert."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "%s schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
@@ -908,60 +1061,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Einstellungen zur Kontrolle der Konvertierung von Comic (CBR, CBZ) Dateien "
 "zu eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 "Titel fĆ¼r erstelltes eBook. In der Voreinstellung wird der Dateiname benutzt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Gibt den Autor in den Metadaten des erstellen eBooks an. Voreinstellung ist "
 "%default."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 "Pfad zur Ausgabedatei. Die Datei wird im aktuellen Verzeichnis erstellt "
 "(Voreinstellung)."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Anzahl der Farben fĆ¼r die Konvertierung von Graustufenbildern. "
 "Voreinstellung: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Deaktivieren der Normalisierung (verbessert den Kontrast) des Farbbereichs "
 "fĆ¼r Bilder. Voreinstellung: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "SeitenverhƤltnis des Bildes beibehalten. Voreinstellung ist "
 "bildschirmfĆ¼llende Darstellung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "SchƤrfen deaktivieren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Bilder im Querformat nicht in zwei Bilder im Hochformat aufteilen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -969,7 +1122,7 @@ msgstr ""
 "SeitenverhƤltnis beibehalten und Bild so skalieren, dass die Bildschirmhƶhe "
 "als Bildbreite in der Querformatansicht verwendet wird."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -977,7 +1130,7 @@ msgstr ""
 "Benutzt fĆ¼r rechts-nach-links Publikationen wie Mangas. Querformatige Seiten "
 "werden von rechts nach links in mehrere hochformatige Seiten unterteilt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -985,7 +1138,7 @@ msgstr ""
 "Entkƶrnung einschalten. Reduziert die Kƶrnigkeit. Kann die Bearbeitungszeit "
 "stark verlƤngern."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -994,7 +1147,7 @@ msgstr ""
 "sortieren, sondern die Reihenfolge verwenden, in der sie zum Comic "
 "hinzugefĆ¼gt wurden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
@@ -1005,7 +1158,7 @@ msgstr ""
 "Diese Einstellung funktioniert fĆ¼r alle GerƤte mit derselben "
 "BildschirmgrĆ¶ĆŸe. Wahlmƶglichkeiten sind %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -1013,11 +1166,11 @@ msgstr ""
 "AusfĆ¼hrlicher, hilfreich zur Fehlersuche. Kann mehrmals angegeben werden um "
 "eine grĆ¶ĆŸere AusfĆ¼hrlichkeit zu erreichen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Fortschrittsbalken nicht anzeigen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
@@ -1027,11 +1180,11 @@ msgstr ""
 "\n"
 "Konvertiert ein Comic einer CBZ oder CBR Datei in ein eBook. \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Ausgabe gespeichert unter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Rendere Seiten des Comics..."
 
@@ -1080,56 +1233,56 @@ msgstr "Einstellungen fĆ¼r html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr "Abruf des Rezepts misslungen: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer Datei erkannt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tAnalysiere HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen Datei erkannt. Analysiere erneut..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "Vorverarbeitetes HTML gespeichert unter "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Verarbeite %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tKonvertiere in BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Konnte Datei nicht analysieren: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s ist eine leere Datei"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Fehlschlag bei der Analysierung von %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Konnte Link %s nicht zu TOC hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Konnte Bild %s nicht verarbeiten. Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Konnte verschachteltes PNG %s nicht verarbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1137,14 +1290,14 @@ msgstr ""
 "Konnte Bild nicht verarbeiten: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "Ein Fehler trat wƤhrend der Bearbeitung einer Tabelle auf: %s. "
 "Tabellenformat wird ignoriert."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1152,11 +1305,11 @@ msgstr ""
 "Schlechte Tabelle:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "Tabelle enthƤlt Zelle, die zu groƟ ist"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1164,19 +1317,19 @@ msgstr ""
 "Sichern Sie die Website %s zuerst als HTML Datei und benutzen Sie dann "
 "html2lrf mit der gespeicherten HTML Datei."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Konnte Umschlagbild nicht lesen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Lesen nicht mƶglich von: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Verarbeitung der OPF Datei schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1425,17 +1578,17 @@ msgstr "Gebe Kommentar ein"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Titel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Autor(en)"
 
@@ -1454,25 +1607,25 @@ msgstr "Kategorie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Bemerkung"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Etiketten"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Serie"
@@ -1481,25 +1634,25 @@ msgstr "Serie"
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 "Eine durch Kommata getrennte Liste von Etiketten, die angewendet werden "
 "sollen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr "Serie, zu der dieses eBook gehƶrt"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr "Serienindex"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr "Sprache des Buches"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr "Umschlagbild extrahieren"
 
@@ -1596,7 +1749,7 @@ msgstr "Benutzung: %s dateiname.lit"
 msgid "Cover saved to"
 msgstr "Umschlagbild gespeichert unter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr "Geben Sie das Feld dc:language an"
 
@@ -1608,11 +1761,11 @@ msgstr "Benutzung: pdf-meta dateiname.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr "Benutzung: rb-meta file.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] dateiname.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "Original MOBI HTML gespeichert in"
 
@@ -1622,7 +1775,7 @@ msgstr ""
 "Das Ausgabeverzeichnis. Laut Voreinstellung das aktuelle Verzeichnis."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "HƤufig benutzte Verzeichnisse"
 
@@ -1695,6 +1848,18 @@ msgstr "Content Server automatisch beim Aufrufen von calibre starten"
 msgid "Oldest news kept in database"
 msgstr "Ƅlteste in der Datenbank gespeicherte Nachrichten"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "Geladene Nachrichten auf das GerƤt Ć¼bertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr "BĆ¼cher nach der Ɯbertragung auf das GerƤt aus der Bibliothek lƶschen"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "GerƤt ist nicht mehr verbunden."
@@ -1730,9 +1895,9 @@ msgstr "Buch auf dem GerƤt ansehen"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pfad"
 
@@ -1740,8 +1905,8 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formate"
@@ -1755,6 +1920,7 @@ msgstr "Dialog"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1831,19 +1997,27 @@ msgstr "Ent&kƶrnung"
 msgid "&Wide"
 msgstr "&Weite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
-msgstr "Allgemein"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr " Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr "Schnittstelle"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "Allgemein"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Schnittstelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
@@ -1851,50 +2025,105 @@ msgstr ""
 "Content\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr "Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr "Kein gĆ¼ltiger Plugin Pfad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr "%s ist kein gĆ¼ltiger Plugin Pfad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr "Plugin wƤhlen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr "Plugin kann nicht ausgeschaltet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr "Plugin nicht anpassbar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr "Plugin: %s bedarf keines Anpassens"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr "Anpassen von %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr "Kann festinstalliertes Plugin nicht entfernen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+" kann nicht entfernt werden, da es ein festinstalliertes Plugin ist. "
+"Versuchen Sie, es auszuschalten."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr "Fehler Log:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "UngĆ¼ltige GrĆ¶ĆŸe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+"Die GrĆ¶ĆŸe %s ist ungĆ¼ltig. Sie muss der Form BreitexHƶhe entsprechen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Muss ein Verzeichnis sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig.<br>Speichern nicht mƶglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Komprimiere Datenbank..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1903,16 +2132,17 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1928,45 +2158,37 @@ msgstr "Zu einem neuen Ort der Datenbank wechseln"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Benachrichtigung anzeigen, wenn &neue Version verfĆ¼gbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "Nach einer BestƤtigung vor dem Lƶschen von Dateien fragen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
-"Wenn sie diese Einstellung ausschalten, dann werden die Metadaten aus dem "
-"Dateinamen erraten. Die Konfiguration ist im Abschnitt \"Erweitert\" mƶglich."
+"Falls Sie diese Einstellung ausschalten, werden die Metadaten aus dem "
+"Dateinamen erschlossen. Dies kann unter Erweitert konfiguriert werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr "&Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "Format zur &Speicherung einer Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&PrioritƤt der KonvertierungsauftrƤge:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "Voreinstellung fĆ¼r Zei&tĆ¼berschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -1974,96 +2196,108 @@ msgstr ""
 "Voreinstellung der ZeitĆ¼berschreitung fĆ¼r Netzwerkabrufe festsetzen (Gilt "
 "immer dann, wenn aus dem Internet Informationen abgerufen werden sollen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wƤh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
-msgstr "Das voreingestellte Ausgabeformat fĆ¼r eBook Konvertierungen."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr "&Ausgabeformat:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "Auftrags&prioritƤt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis zur Liste der hƤufig genutzten Verzeichnisse hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis von der Liste der hƤufig genutzten Verzeichnisse entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "&Rƶmische Ziffern fĆ¼r Serien Nummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 "A&nzahl der Umschlagbilder, die (nach einem Neustart) in der Cover-Ansicht "
 "angezeigt werden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "GroƟ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "&GrĆ¶ĆŸe der SchaltflƤchen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in SchaltflƤchen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "Si&chtbare Spalten in Bibliothek-Ansicht wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr "Den internen &Viewer fĆ¼r die folgenden Formate verwenden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+"Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "Geladene &Nachrichten automatisch an das GerƤt senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "Nachrichten nach dem Senden an das GerƤt aus der Bibliothek &lƶschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Freier unbenutzter Festplattenspeicher der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "Datenbank &komprimieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Meta-Daten aus dem Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2073,23 +2307,23 @@ msgstr ""
 "von Ć¼berall aus mit Hilfe eines Browsers auf Ihre BĆ¼chersammlung zugreifen "
 "kƶnnen. EinstellungsƤnderungen erfolgen erst nach einem Neustart des Servers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "Ben&utzername:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2097,33 +2331,45 @@ msgstr ""
 "Wenn Sie das Kennwort leer lassen, kann jeder auf Ihre BĆ¼chersammlung Ć¼ber "
 "das Webinterface zugreifen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+"Maximale GrĆ¶ĆŸe (BreitexHƶhe) der angezeigten Covers. GrĆ¶ĆŸere Covers werden "
+"verkleinert. "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr "Maximale &Cover-GrĆ¶ĆŸe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2137,6 +2383,46 @@ msgstr ""
 "auf Ihrem iPhone hinzufĆ¼gen. In diesem Fall sollte meinservername der volle "
 "Hostname oder die IP Adresse dieses Rechners sein."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+"Hier kƶnnen Sie das Verhalten von Calibrie anpassen, indem sie festlegen, "
+"welche Plugins verwendet werden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr "Plugin &ein-/ausschalten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr "Plugin &anpassen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr "Plugin entfe&rnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr "Neues Plugin hinzufĆ¼gen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr "&Plugin Datei:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr "&HinzufĆ¼gen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr "Sicher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr "&Warnung erneut anzeigen"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "FEHLER"
@@ -2154,7 +2440,7 @@ msgstr "%s in EPUB konvertieren"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Meta-Daten"
 
@@ -2215,25 +2501,25 @@ msgstr "WƤhlen Sie das Umschlagbild fĆ¼r "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Lesen nicht mƶglich"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Sie haben nicht die nƶtigen Rechte, um diese Datei zu lesen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Es trat ein Fehler beim Lesen dieser Datei auf: <br /><b>"
 
@@ -2243,7 +2529,7 @@ msgid " is not a valid picture"
 msgstr " ist kein gĆ¼ltiges Bild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Konvertierung nicht mƶglich"
 
@@ -2286,22 +2572,22 @@ msgid "Book Cover"
 msgstr "Umschlagbild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Um&schlagbild der Quelldatei verwenden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "&Umschlagbild Ƥndern:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Nach Umschlagbild durchsuchen..."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Um&schlagbild der Quelldatei verwenden"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2316,14 +2602,14 @@ msgstr "Titel dieses Buches Ƥndern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Autor(en): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2349,14 +2635,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Herausgeber: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Herausgeber dieses Buches Ƥndern"
@@ -2369,7 +2655,7 @@ msgstr "&Etiketten: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2381,7 +2667,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Serien:"
@@ -2390,8 +2676,8 @@ msgstr "&Serien:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2841,8 +3127,8 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2852,24 +3138,24 @@ msgstr ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Meta-Informationen bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta-Informationen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "S&ortierung nach Autor: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2878,49 +3164,53 @@ msgstr ""
 "Geben Sie an, wie der Autor dieses Buches sortiert werden soll. \"Charles "
 "Dickens\" zum Beispiel als \"Dickens, Charles\"."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Bewertung:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Bewertung dieses Buches: 0-5 Sterne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " Sterne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "&Etiketten hinzufĆ¼gen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Etiketten-Editor ƶffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "Etiketten entfe&rnen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 "Durch Kommata getrennte Liste der Etiketten, die von den BĆ¼chern entfernt "
 "werden. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr "&Format entfernen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr "Automatisch Sortierung nach Autor setzen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2930,19 +3220,19 @@ msgstr ""
 "<b>LibraryThing.com</b> an. <br/>Insofern Sie dies nicht besitzen, kƶnnen "
 "Sie sich kostenlos <a href='http://www.librarything.com'>anmelden</a>! </p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Konnte kein Umschlagbild abrufen.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Konnte kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Kann kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Sie mĆ¼ssen die ISBN fĆ¼r dieses Buch angeben."
 
@@ -3007,63 +3297,82 @@ msgstr "Passwort Ƥndern"
 msgid "Password needed"
 msgstr "Passwort erforderlich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr "Sie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr "%d Rezepte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr "Account-Informationen mĆ¼ssen angegeben werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr "Dieses Rezept erfordert einen Benutzernamen und ein Kennwort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr "Erstellt von: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr "Zuletzt geladen: vor %s Tagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr "Zuletzt geladen: niemals"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr "Zeitgesteuerter Nachrichten Download"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "Neue individuelle Nachrichtenquelle hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr "Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Rezepte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr "Zeitplanung des Downloads"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr "Beschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr "Autor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr "Ge&planter Download jeden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
@@ -3071,25 +3380,25 @@ msgstr ""
 "Intervall, nach dem dieses Rezept geladen werden soll. Der Wert 0 hat einen "
 "stĆ¼ndlich wiederkehrenden Download zur Folge."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " Tage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr "&Account"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr "Damit der Zeitplan funktioniert, muss calibre gestartet bleiben."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr "&Jetzt laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
@@ -3097,7 +3406,7 @@ msgstr ""
 "Geladene Nachrichten lƶschen, die Ƥlter als die angegebene Zahl von Tagen "
 "sind. Zum Ausschalten auf den Wert 0 setzen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr "Geladene Nachrichten lƶschen, die Ƥlter sind als "
 
@@ -3213,7 +3522,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:63
 msgid "No recipe selected"
-msgstr "Kein Rezept ausgewƤhlt"
+msgstr "Kein Rezept gewƤhlt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
 msgid "The attached file: %s is a recipe to download %s."
@@ -3260,25 +3569,25 @@ msgstr "Dieser Feed wurde schon zu diesem Rezept hinzugefĆ¼gt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "UngĆ¼ltige Eingabe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>Konnte Rezept nicht erstellen. Fehler:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Rezept ersetzen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 "Es gibt schon ein erstelltes Rezept mit dem Namen %s. Soll es ersetzt werden?"
@@ -3291,9 +3600,9 @@ msgstr "Rezept wƤhlen"
 msgid "Pick the recipe to customize"
 msgstr "Rezept zum Anpassen auswƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
-msgstr "Eine Rezept Datei auswƤhlen"
+msgstr "Eine Rezept Datei wƤhlen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:214
 msgid "Add custom news source"
@@ -3557,52 +3866,64 @@ msgstr "Abwarten und Tee trinken..."
 msgid "Working"
 msgstr "Bei der Arbeit..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "Kann Auftrag nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Kann AuftrƤge, die mit dem GerƤt kommunizieren, nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr "Auftrag wird schon ausgefĆ¼hrt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "GrĆ¶ĆŸe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Keine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Buch <font face=\"serif\">%s</font> von %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr "Das ist nicht gestattet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+"Direktes HinzufĆ¼gen auf das GerƤt wird nicht unterstĆ¼tzt. FĆ¼gen Sie das Buch "
+"zuerst zur Bibliothek hinzu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Suche (Zur erweiterten Suche die SchaltflƤche links klicken)"
 
@@ -3631,7 +3952,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> fĆ¼r die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -3656,12 +3977,12 @@ msgid "Previous Page"
 msgstr "Vorherige Seite"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "ZurĆ¼ck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Weiter"
 
@@ -3670,7 +3991,7 @@ msgid "Next match"
 msgstr "NƤchster Treffer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "eBook ƶffnen"
 
@@ -3678,23 +3999,27 @@ msgstr "eBook ƶffnen"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem GerƤt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr "&Spenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr "Be&enden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr "&Neustart"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3702,126 +4027,131 @@ msgstr ""
 "<p>Hilfe gibt es online bei <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s von <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "An Hauptspeicher senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "An Speicherkarte senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr "und aus der Datenbank lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "Auf die Speicherkarte senden (Voreinstellung)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Meta-Daten einzeln bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Meta-Daten auf einmal bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "BĆ¼cher aus einem einzelnen Verzeichnis hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"BĆ¼cher rekursiv hinzufĆ¼gen (Ein Buch pro Verzeichnis, setzt voraus, dass "
-"jede eBook Datei das gleiche Buch in einem unterschiedlichen Format enthƤlt)"
+"BĆ¼cher aus Verzeichnissen hinzufĆ¼gen, inklusive Unterverzeichnissen (ein "
+"Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
+"verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"BĆ¼cher rekursiv hinzufĆ¼gen (Mehrere BĆ¼cher pro Verzeichnis, setzt voraus, "
-"dass jede eBook Datei ein anderes Buch enthƤlt)"
+"BĆ¼cher aus Verzeichnissen hinzufĆ¼gen, inklusive Unterverzeichnissen "
+"(verschiedene BĆ¼cher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Vorschau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Spezielles Format ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Einzeln konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr "Voreinstellung fĆ¼r Konvertierung eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr "Voreinstellungen fĆ¼r die Konvertierung von Comics eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr "Ƅhnliche BĆ¼cher..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr "WƤhlen Sie einen Speicherort fĆ¼r Ihre eBook Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr "Migriere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "GerƤt: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Angeschlossen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "GerƤtedatenbank ist beschƤdigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3852,8 +4182,25 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr "Stop"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr "FĆ¼ge BĆ¼cher rekursiv hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr "HinzugefĆ¼gt "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr "Suche..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3861,100 +4208,121 @@ msgstr ""
 "<p>Es existieren bereits BĆ¼cher mit dem selben Titel in der Datenbank. "
 "Sollen die folgenden BĆ¼cher trotzdem hinzugefĆ¼gt werden?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Duplikate gefunden!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "Lade BĆ¼cher auf das GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr "BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr "EPUB BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr "LRF BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr "HTML BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr "LIT BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr "MOBI BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr "Text BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr "PDF BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr "Lese Metadaten..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr "FĆ¼ge BĆ¼cher hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr "Lese Metadaten von "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr "FĆ¼ge BĆ¼cher zur Datenbank hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "GerƤtespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Es kƶnnen keine BĆ¼cher mehr auf das GerƤt geladen werden, da der "
 "GerƤtespeicher voll ist "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
-msgstr "BestƤtigen Sie das Lƶschen"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Die gewƤhlten BĆ¼cher werden <b>dauerhaft gelƶscht</b> und die Dateien vom "
+"Computer entfernt. Sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr "Sind Sie sicher, dass Sie diese %d BĆ¼cher lƶschen wollen?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "Lƶsche BĆ¼cher vom GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Keine BĆ¼cher ausgewƤhlt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr "Sende Nachrichten an das GerƤt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "Sende BĆ¼cher an das GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3962,15 +4330,15 @@ msgstr ""
 "Die folgenden BĆ¼cher konnten nicht auf das GerƤt geladen werden, da keine "
 "geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3978,59 +4346,64 @@ msgstr ""
 "<p>Die folgenden BĆ¼cher konnten nicht auf die Festplatte gespeichert werden, "
 "da das %s Format fĆ¼r sie nicht verfĆ¼gbar ist:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Konnte einige eBooks nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Kein Buch ausgewƤhlt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Ansehen nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr "Konnte Verzeichnis nicht ƶffnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s hat keine verfĆ¼gbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Konfiguration nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht mƶglich wƤhrend AuftrƤge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr "Kopiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiere Bibliothek nach "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "UngĆ¼ltige Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4038,23 +4411,24 @@ msgstr ""
 "<p>Es existiert bereits eine ungĆ¼ltige Datenbank in %s, bitte lƶschen Sie "
 "diese, bevor sie die bestehende Datenbank verschieben.<br>Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "Konnte Datenbank nicht verschieben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "Es ist keine weitere Information verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
-msgstr "Es ist keine weitere Information Ć¼ber BĆ¼cher auf dem GerƤt verfĆ¼gbar"
+msgstr ""
+"Es sind keine weitere Informationen Ć¼ber BĆ¼cher auf dem GerƤt verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum GerƤt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4062,13 +4436,13 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem GerƤt auf. Bitte entfernen "
 "und schlieƟen Sie das GerƤt wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4077,11 +4451,11 @@ msgstr ""
 "href=\"%s\">DRM</a> geschĆ¼tzt. Sie mĆ¼ssen zunƤchst das DRM mit einem anderen "
 "Programm entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "Datenbank existiert nicht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -4089,11 +4463,11 @@ msgstr ""
 "Das Verzeichnis, in dem die Datenbank sein sollte: %s existiert nicht mehr. "
 "Bitte wƤhlen Sie einen neuen Ort fĆ¼r die Datenbank aus."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr "WƤhlen Sie einen neuen Speicherort fĆ¼r die Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4102,12 +4476,12 @@ msgstr ""
 "Falls Sie es nĆ¼tzlich finden, sollten Sie eine Spende zur UnterstĆ¼tzung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive AuftrƤge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
@@ -4117,11 +4491,11 @@ msgstr ""
 "                  'Ein Beenden kann das GerƤt beschƤdigen.<br>\n"
 "                  'Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive AuftrƤge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4129,7 +4503,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum SchlieƟen wƤhlen Sie <b>Beenden</b> "
 "im KontextmenĆ¼ des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4137,7 +4511,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4147,39 +4521,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">neuen Features</a> an. "
 "Mƶchten Sie die Download Seite besuchen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "Neue Version verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr "Informationen zur Fehlersuche in Konsole aufzeichnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr "System Tray Icon ausschalten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr "Ausgabe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4187,7 +4561,7 @@ msgstr ""
 "Liste der BĆ¼cher nach Titel oder Autor durchsuchen<br><br>Durch Leerzeichen "
 "getrennte Wƶrter werden mit \"UND\" verknĆ¼pft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4196,75 +4570,99 @@ msgstr ""
 "durchsuchen<br><br>Durch Leerzeichen getrennte Wƶrter werden mit \"UND\" "
 "verknĆ¼pft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Quick Search lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr "Ɯbereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr "Ɯbereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr "Nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "BĆ¼cher hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "BĆ¼cher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "An Reader Ć¼bertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr "Ɩffne enthaltenes Verzeichnis"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr "Zeige Buchdetails"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr "BĆ¼cher desselben Autors"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr "BĆ¼cher dieser Serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr "BĆ¼cher dieses Herausgebers"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr "BĆ¼cher mit denselben Etiketten"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -4278,23 +4676,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "FEHLER: Unbehandelte Ausnahme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "AuftrƤge:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Ein Klick zeigt die aktiven AuftrƤge."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Klicken Sie, um die BĆ¼cher in der Cover-Ansicht zu durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Klicken Sie, um die Cover-Ansicht zu verlassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4302,7 +4700,7 @@ msgstr ""
 "<p>Die Cover-Ansicht ist gesperrt.<br>Der Import des Pictureflow Moduls "
 "schlug fehl:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr "Klicken Sie, um die BĆ¼cher anhand von Etiketten zu durchsuchen"
 
@@ -4449,7 +4847,7 @@ msgid "The standard font type"
 msgstr "Standardschriftart"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -4475,59 +4873,59 @@ msgstr ""
 msgid "Search for text in book"
 msgstr "Suche nach Text im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr "eBook wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr "Titel fĆ¼r Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden fĆ¼r: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Dieses Buch ist geschĆ¼tzt durch <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr "DRM Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht ƶffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4537,50 +4935,54 @@ msgstr ""
 "\n"
 "eBook ansehen.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr "eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr "NƤchste Seite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr "Vorherige Seite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr "GrĆ¶ĆŸere Schrift"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr "Kleinere Schrift"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr "Weitersuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Voreinstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr "Verweismodus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr "Vollbildmodus beenden"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "UngĆ¼ltiger regulƤrer Ausdruck"
@@ -4589,36 +4991,46 @@ msgstr "UngĆ¼ltiger regulƤrer Ausdruck"
 msgid "Invalid regular expression: %s"
 msgstr "UngĆ¼ltiger regulƤrer Ausdruck: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Bibliothek"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+"Bibliothek\n"
+"%d\n"
+"BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Reader\n"
-"%s verfĆ¼gbar"
+"%s\n"
+"verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Karte\n"
-"%s verfĆ¼gbar"
+"%s\n"
+"verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr "Ein Klick zeigt die Liste der auf dem Computer vorhandenen BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Ein Klick zeigt die Liste der im Hauptspeicher des GerƤts vorhandenen BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Ein Klick zeigt die Liste der auf der Speicherkarte des GerƤts vorhandenen "
@@ -4651,6 +5063,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr "Benutzername fĆ¼r den Zugriff. StandardmƤƟig ist es: %default"
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr "Maximale GrĆ¶ĆŸe fĆ¼r angezeigte Covers"
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4966,29 +5382,29 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr "<p>Kopiere BĆ¼cher nach %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 "Kennwort fĆ¼r den Zugriff auf die calibre Bibliothek. Benutzername ist "
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
@@ -4998,52 +5414,60 @@ msgstr ""
 "\n"
 "Startet den calibre Content-Server."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "Konnte Arbeitsprozess nicht starten."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr "Auftrag durch Benutzer unterbrochen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sBenutzung%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Erstellt von "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr "Pfad zur Datenbank in der die BĆ¼cher gespeichtert sind"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr "Verhaltensmuster zum Erraten der Metadaten aus den Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr "ZugangsschlĆ¼ssel fĆ¼r isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 "Voreinstellung der ZeitĆ¼berschreitung bei Netzwerkverbindungen (in Sekunden)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr "Pfad zum Verzeichnis, in dem die Bibliothek gespeichert ist"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr "Sprache, in der die Benutzer-OberflƤche dargestellt wird"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Das voreingestellte Ausgabeformat fĆ¼r eBook Konvertierungen."
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr "Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr "PrioritƤt der ArbeitsauftrƤge"
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr "Konnte die fontconfig library nicht initialisieren"
 
@@ -5063,13 +5487,13 @@ msgstr "Konnte SSH Sitzung nicht abschlieƟen: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authentifizierung schlug fehl am Server: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Feed unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "Artikel ohne Titel"
 
@@ -5084,7 +5508,7 @@ msgid "Customize the download engine"
 msgstr "Download-Engine anpassen"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -5093,7 +5517,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -5102,7 +5526,7 @@ msgstr ""
 "Voreinstellung ist %default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -5111,7 +5535,7 @@ msgstr ""
 "Voreinstellung wird versucht, die Kodierung zu erraten."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -5123,7 +5547,7 @@ msgstr ""
 "Links verfolgt."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -5138,7 +5562,7 @@ msgstr ""
 "sind, wird --filter-regexp zuerst angewendet."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "Lade CSS Stylesheets nicht herunter."
 
@@ -5270,70 +5694,70 @@ msgid "Dont show the progress bar"
 msgstr "Fortschrittsbalken nicht anzeigen"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "Der Download der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Der Download von Teilen der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene VerknĆ¼pfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 "Konnte Artikel nicht abrufen. Der erneute Start mit --debug zeigt mƶgliche "
 "GrĆ¼nde an"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "Feeds der Index Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "Versuche Umschlagbild zu laden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starte Download von [%d Thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "Konnte Umschlagbild nicht laden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "Lade Umschlagbild von %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -5343,23 +5767,23 @@ msgstr ""
 "Artikel %s von %s geladen\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "Artikel geladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "Laden der Artikel fehlgeschlagen: %s von %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Laden der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "Rufe Feed ab"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -5369,13 +5793,13 @@ msgstr ""
 "\n"
 "URL ist z.B. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Grundverzeichnis, in das die URL gespeichert wird. Voreinstellung ist "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -5383,7 +5807,7 @@ msgstr ""
 "Maximale Zahl von einbezogenen Ebenen, z.B. Tiefe der Links, die verfolgt "
 "werden. Voreinstellung %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5391,7 +5815,7 @@ msgstr ""
 "Hƶchstzahl der Dateien, die geladen werden. Dies trifft nur auf Dateien aus "
 "<a href> Tags zu. Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 
@@ -5438,6 +5862,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "Speicherort der BĆ¼cherdatenbank (&library1.db)"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&PrioritƤt der KonvertierungsauftrƤge:"
+
 #~ msgid "&Access Key;"
 #~ msgstr "&ZugriffsschlĆ¼ssel:"
 
@@ -5510,6 +5937,20 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Ƅnderungen treten erst nach einem Neustart in Kraft."
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "BĆ¼cher rekursiv hinzufĆ¼gen (Ein Buch pro Verzeichnis, setzt voraus, dass "
+#~ "jede eBook Datei das gleiche Buch in einem unterschiedlichen Format enthƤlt)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "BĆ¼cher rekursiv hinzufĆ¼gen (Mehrere BĆ¼cher pro Verzeichnis, setzt voraus, "
+#~ "dass jede eBook Datei ein anderes Buch enthƤlt)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Nachrichten abgerufen. Ɯbertragung ans GerƤt lƤuft."
 
@@ -5524,6 +5965,23 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "Custom news sources"
 #~ msgstr "Individuelle Nachrichtenquellen"
 
+#~ msgid "Library"
+#~ msgstr "Bibliothek"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Reader\n"
+#~ "%s verfĆ¼gbar"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Karte\n"
+#~ "%s verfĆ¼gbar"
+
 #~ msgid "Job killed by user"
 #~ msgstr "Auftrag durch Benutzer abgebrochen"
 
@@ -5540,6 +5998,29 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid " does not allow copying of text."
 #~ msgstr " lƤsst das Kopieren von Text nicht zu."
 
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+
 #~ msgid ""
 #~ "Path to the calibre database. Default is to use the path stored in the "
 #~ "settings."
@@ -5704,6 +6185,15 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Die Voreinstellung ist der SONY PRS-500 mit einer BildschirmgrĆ¶ĆŸe von "
 #~ "584x754 Punkten. Wahlmƶglichkeiten sind %s"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Nach einer BestƤtigung vor dem Lƶschen von Dateien fragen"
+
+#~ msgid "Confirm delete"
+#~ msgstr "BestƤtigen Sie das Lƶschen"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Sind Sie sicher, dass Sie diese %d BĆ¼cher lƶschen wollen?"
+
 #~ msgid ""
 #~ "%prog [options] comic.cb[z|r]\n"
 #~ "\n"
@@ -5783,5 +6273,42 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Sammelt zudem jegliche Hinweise und Quellen wie Bilder, Stylesheets, "
 #~ "Skripte, etc. \n"
 
+#~ msgid ""
+#~ "If fewer than this number of chapters is detected, then links are added to "
+#~ "the Table of Contents."
+#~ msgstr ""
+#~ "Falls weniger Kapitel erkannt werden als in dieser Zahl angegeben, dann "
+#~ "werden VerknĆ¼pfungen zum Inhaltsverzeichnis hinzugefĆ¼gt."
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [options] Dateiname\n"
+#~ "\n"
+#~ "Konvertiert eine groƟe Anzahl von eBook Formaten in eine EPUB Datei. "
+#~ "UnterstĆ¼tzte Formate: %s\n"
+
+#~ msgid "LRF"
+#~ msgstr "LRF"
+
+#~ msgid "EPUB"
+#~ msgstr "EPUB"
+
+#~ msgid "&Output format:"
+#~ msgstr "&Ausgabeformat:"
+
+#~ msgid ""
+#~ "If you disable this setting, metadatas is guessed from the filename instead. "
+#~ "This can be configured in the Advanced section."
+#~ msgstr ""
+#~ "Wenn sie diese Einstellung ausschalten, dann werden die Metadaten aus dem "
+#~ "Dateinamen erraten. Die Konfiguration ist im Abschnitt \"Erweitert\" mƶglich."
+
 #~ msgid "Detailed logging"
 #~ msgstr "AusfĆ¼hrliche Protokollierung"
+
+#~ msgid "Disable system tray icon"
+#~ msgstr "System Tray Icon ausschalten"
diff --git a/src/calibre/translations/el.po b/src/calibre/translations/el.po
index e7f25f371d..3a1a358bd7 100644
--- a/src/calibre/translations/el.po
+++ b/src/calibre/translations/el.po
@@ -7,55 +7,229 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-06-24 07:23+0000\n"
 "Last-Translator: Thanos Petkakis <thanospet@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Ī†Ī³Ī½Ļ‰ĻƒĻ„Īæ"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -69,7 +243,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -77,17 +251,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -96,38 +270,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -135,134 +309,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Ī†Ī³Ī½Ļ‰ĻƒĻ„Īæ"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +395,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +414,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +513,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -437,7 +577,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Ī•ĪŗĪ“ĻŒĻ„Ī·Ļ‚"
 
@@ -678,11 +818,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -693,118 +833,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -845,95 +985,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1132,17 +1272,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1161,25 +1301,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1188,23 +1328,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1283,7 +1423,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1435,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,7 +1448,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1376,6 +1516,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1411,9 +1563,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1421,8 +1573,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1436,6 +1588,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1511,83 +1664,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1817,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,6 +2021,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1811,7 +2076,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1865,25 +2130,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,7 +2158,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1934,22 +2199,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1964,14 +2229,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,14 +2257,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2012,7 +2277,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,7 +2286,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2030,8 +2295,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2444,91 +2709,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2590,93 +2859,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2826,25 +3114,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,7 +3144,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3086,52 +3374,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3160,7 +3458,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3483,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3199,7 +3497,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3505,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3666,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,29 +4118,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3912,7 +4283,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3936,109 +4307,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4047,31 +4422,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4479,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4326,79 +4710,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Ī”Ī·Ī¼Ī¹ĪæĻ…ĻĪ³Ī®ĪøĪ·ĪŗĪµ Ī±Ļ€Īæ Ļ„ĪæĪ½ "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4418,13 +4810,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4437,28 +4829,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +4858,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,7 +4868,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4573,113 +4965,113 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
diff --git a/src/calibre/translations/es.po b/src/calibre/translations/es.po
index 7ebbc0a0b8..d72efd46aa 100644
--- a/src/calibre/translations/es.po
+++ b/src/calibre/translations/es.po
@@ -10,32 +10,209 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-15 16:21+0000\n"
-"Last-Translator: Pablo Carmona A. <Unknown>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-28 11:11+0000\n"
+"Last-Translator: Paco Molinero <paco@byasl.com>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "No hace nada en absoluto"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Base"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Tipo de archivo"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Lector de metadatos"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Escritor de metadados"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"Seguir los enlaces de un archivo HTML y crear un archivo ZIP con los "
+"archivos enlazados. Este complemento se ejecuta cada ver que se aƱade un "
+"archivo HTML a la biblioteca"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Leer metadatos desde archivos %s"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "Complementos instalados"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr "PersonalizaciĆ³n del complemento local"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Complementos desactivados"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr "No se ha encontrado ningĆŗn complemento vĆ”lido en "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr "Lista de todos los complementos instalados"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr "Activar el complemento nombrado"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr "Desactivar el complemento nombrado"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "No se ha podido detectar la unidad de disco %s. Trate de reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "El lector no tiene ninguna tarjeta de almacenamiento conectada"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Opciones a controlar la conversiĆ³n a EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -43,24 +220,24 @@ msgstr ""
 "El archivo EPUB de salida. Si no es especificado, es derivado de el nombre "
 "del archivo de entrada."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Control de auto-detecciĆ³n de estructura de documento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -74,7 +251,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -82,17 +259,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -106,38 +283,38 @@ msgstr ""
 "de intentar\n"
 "generar una nueva.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "No aƱadir los capitulos autodetectados a la Tabla de Contenidos"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -145,134 +322,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -288,8 +413,13 @@ msgstr ""
 "enlaces se tomarĆ” del elemento\n"
 "<spine> en el archivo OPF  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "Debe especificar un archivo HTML de entrada."
 
@@ -302,30 +432,30 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "Escribir el HTML procesado en "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "El directorio de Salida. Por defecto es el directorio actual."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "CodificaciĆ³n de carĆ”cter para archivos HTML. Por defecto a auto detectar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -333,17 +463,17 @@ msgstr ""
 "Crear la salida en un archivo zip. Si esta opciĆ³n es especificada, el --"
 "output deberĆ­a ser el nombre del archivo y no del directorio."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Control del seguimiento de enlaces en archivos HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -352,49 +482,49 @@ msgstr ""
 "Debe ser un numero no-negativo. 0 implica que no se seguirĆ” ningĆŗn enlace en "
 "el archivo HTML raiz."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Establecer metadata del documento generado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Establecer el titulo. Por defecto es autodetectado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "El autor/es de este libro, mediante una lista separada por comas."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Utiles opciones para depurar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -407,28 +537,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr "%prog [options] LITFILE"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr "Directorio de salida. Por defecto es el directorio actual"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr "%prog [options] LITFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr "Directorio de salida. Por defecto es el directorio actual"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "ƚtil para depuraciĆ³n."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "Ebook OEB creado en"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Establecer tĆ­tulo. Por defecto: nombre_del_archivo"
@@ -460,7 +603,7 @@ msgstr "Clave de orden para el autor"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Editorial"
 
@@ -767,11 +910,11 @@ msgstr ""
 "es cp-1252. Otra opciĆ³n habitual es utf-8. La opciĆ³n por defecto es intentar "
 "adivinar la codificaciĆ³n."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -784,76 +927,76 @@ msgstr ""
 "any2lrf [optiones] miarchivo\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "No se ha especificado ningun fichero para convertir"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "Fallido %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Opciones a controlar la conversiĆ³n de archivos cĆ³micas(CBR, CBZ) en "
 "documentos."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 "Titulo para documento generado. Por defecto es a usar el nombre de archivo."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Establece el autor en el metadato del ebook generado. Por defecto es %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "NĆŗmero de colores para conversiĆ³n de imĆ”genes a escala de grises. Por "
 "defecto es %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Deshabilitar normalizar(mejorar contraste) rango de color para imƔgenes. Por "
 "defecto: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "Mantener relaciĆ³n de aspecto de la imagen. El valor por defecto es para "
 "rellenar la pantalla."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "Deshabilitar afilar."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "No dividir imƔgenes apaisadas en dos imƔgenes verticales"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -861,7 +1004,7 @@ msgstr ""
 "Mantener la proporciĆ³n en el tamaƱo de la imagen, usando la altura de la "
 "pantalla como ancho de imagen en el modo de visualizaciĆ³n apaisado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -869,13 +1012,13 @@ msgstr ""
 "Usado para publicaciones de derecha a izquierda como Mangas. Causa formatear "
 "paginas a ser divididas en paginas vertical de derecha a izquierda."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -883,14 +1026,14 @@ msgstr ""
 "No sortear los archivos encontrados en el comic por nombre alfabƩtico. En "
 "vez usar el orden en el que fueron agregados al comic."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -898,22 +1041,22 @@ msgstr ""
 "InformaciĆ³n y mensajes mĆ”s descriptivos. ƚtil para depuraciĆ³n de errores. Se "
 "puede especificar varias veces para mayor descriptividad."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "No mostrar barra de progreso."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Salida escrita a"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Interpretando paginas comic..."
 
@@ -963,56 +1106,56 @@ msgstr "Opciones para controlar el comportamiento de html2rtf"
 msgid "Fetching of recipe failed: "
 msgstr "ObtenciĆ³n fallida de la receta: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer archivo detectado."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tAnalizando HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen archivo detectado. Volver a analizar..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "HTML preprocesado escrito en "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Procesando %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tConversiĆ³n a BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "No se pudo analizar el archivo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s es un archivo vacĆ­o"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "No se pudo analizar el enlace %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "No se puedo aƱadir el enlac %s al TOC"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Incapaz de procesar imagen %s. Error: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Incapaz de procesar PNG entrelazado %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1020,14 +1163,14 @@ msgstr ""
 "No se puedo procesar imagen: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "OcurriĆ³ un error al procesar la tabla: %s. Se ignora la identificaciĆ³n de la "
 "tabla."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1035,11 +1178,11 @@ msgstr ""
 "Tabla errĆ³nea:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "La tabla contiene una celda demasiado larga"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1047,19 +1190,19 @@ msgstr ""
 "Primero debe guardar la pƔgina web %s como un archivo html y despuƩs "
 "ejecutar html2rtf sobre Ć©l."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "No se puedo leer la imagen de portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "No se puedo leer de: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Incapaz de procesar el archivo opf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1300,23 +1443,23 @@ msgstr "Vea el comentario"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "TĆ­tulo"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Autor(es)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
 msgid "Producer"
-msgstr ""
+msgstr "Producido por"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:277
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:504
@@ -1329,50 +1472,50 @@ msgstr "CategorĆ­a"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Comentarios"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Etiquetas"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Series"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:282
 msgid "Language"
-msgstr ""
+msgstr "Idioma"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr "Lista de etiquetas separada por comas que desea establecer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1466,7 +1609,7 @@ msgstr "Uso: %s archivo.lit"
 msgid "Cover saved to"
 msgstr "Portada guardada en"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1478,11 +1621,11 @@ msgstr "Uso: pdf-meta archivo.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr "Uso: rb-meta file.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opciones] miebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "HTML MOBI en bruto guardado en"
 
@@ -1491,7 +1634,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "Directorios usados con frecuencia"
 
@@ -1560,6 +1703,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "Mostrar el icono en la bandeja del sistema"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "Dispositivo no esta conectado."
@@ -1595,9 +1750,9 @@ msgstr "Ver libro en dispositvo"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Ruta"
 
@@ -1605,8 +1760,8 @@ msgstr "Ruta"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formatos"
@@ -1620,6 +1775,7 @@ msgstr "DiƔlogo"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1627,11 +1783,11 @@ msgstr "TextLabel"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
 msgid "&Previous"
-msgstr ""
+msgstr "&Anterior"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
 msgid "&Next"
-msgstr ""
+msgstr "Siguie&nte"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
@@ -1695,68 +1851,128 @@ msgstr ""
 msgid "&Wide"
 msgstr "&Ancho"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr " complementos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr "por"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Avanzada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "General"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Interfaz:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr "Complementos"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
-msgstr ""
+msgstr "Registro de errores:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
-msgstr ""
+msgstr "Registro de accesos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "TamaƱo no vƔlido"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "UbicaciĆ³n no vĆ”lida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Debe ser un directorio."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "UbicaciĆ³n no vĆ”lida "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "UbicaciĆ³n no vĆ”lida.<br>Imposible escribir en "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Compactando base de datos. Esto podrĆ­a durar un rato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Compactando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "ConfiguraciĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1764,16 +1980,17 @@ msgstr ""
 "Emplazamiento de los ebooks (Los ebooks son almacenados en carpetas "
 "ordenadas por autor, los metadatos se almacenan en el archivo metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Navegar a la nueva ubicaciĆ³n de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1789,43 +2006,35 @@ msgstr "Navegar a la nueva ubicaciĆ³n de la base de datos"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Mostrar aviso cuando una &nueva versiĆ³n estĆ© disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "Solicitar &confirmaciĆ³n antes de eliminar archivos"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "Formato al guardar un &Ćŗnico archivo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&Prioridad para los trabajos de conversiĆ³n:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "&timeout por defecto de la red:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -1833,147 +2042,168 @@ msgstr ""
 "Establecer el tiempo de espera maximo para peticiones de red (cuando "
 "conectamos a internet para adquirir alguna informaciĆ³n)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " segundos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr "Seleccionar idioma (requiere reiniciar el programa)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "Normal"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Alta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "Baja"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "AƱadir directorio a la lista de directorios frecuentes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Eliminar directorio a la lista de directorios frecuentes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "Uso de numerales &romanos para nĆŗmeros de serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Medio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "PequeƱo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "TamaƱo de &botĆ³n en la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "Mostrar &texto en los botones de la barra de herramientas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "Seleccione las &columnas visibles en la vista de biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Espacio de disco disponible de la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "&Compactar base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Metadatos a partir del nombre de archivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "&Usuario:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&ContraseƱa:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "&Mostrar clave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1982,6 +2212,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr "&AƱadir"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "ERROR"
@@ -1999,7 +2267,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadatos"
 
@@ -2053,25 +2321,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "No se puede leer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "No tienes permiso de lectura en el archivo: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Error leyendo archivo"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Hubo un error leyendo el archivo: <br /><b>"
 
@@ -2081,7 +2349,7 @@ msgid " is not a valid picture"
 msgstr " no es una imagen vƔlida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "No se puede convertir"
 
@@ -2122,22 +2390,22 @@ msgid "Book Cover"
 msgstr "Portada"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Usar portada del archivo &fuente"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Cambia la imagen de &portada:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Localizar una imagen a utilizar como portada de este libro."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Usar portada del archivo &fuente"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2152,14 +2420,14 @@ msgstr "Cambiar el tĆ­tulo del libro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Autor(es): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2182,14 +2450,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Editorial: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Cambia la editorial del libro"
@@ -2202,7 +2470,7 @@ msgstr "Etique&tas: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2213,7 +2481,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Series:"
@@ -2222,8 +2490,8 @@ msgstr "&Series:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2649,35 +2917,25 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Editar Meta-informaciĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta-informaciĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "&Ordenar autores: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2686,47 +2944,51 @@ msgstr ""
 "Especificar cĆ³mo ordenar el(los) autor(es) de este libro. Por ejemplo,ordena "
 "Federico GarcĆ­a Lorca como Lorca, Federico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&ValoraciĆ³n:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Valora este libro: 0-5 estrellas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " estrellas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "AƱa&dir las etiquetas: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Abrir editor de etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "&Quitar etiquetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr "Lista de etiquetas separadas por comas para eliminar de los libros "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2736,19 +2998,19 @@ msgstr ""
 "<b>LibraryThing.com</b>. <br/>Si no dispone de una cuenta, puede <a "
 "href='http://www.librarything.com'>regisrarse</a> de manera gratuita.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>No se puede descargar la portada.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "No se puede descargar la portada."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "No se puede descargar la portada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Especifique primero un ISBN vƔlido para el libro."
 
@@ -2813,93 +3075,112 @@ msgstr "Cambiar contraseƱa"
 msgid "Password needed"
 msgstr "Se necesita contraseƱa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "AƱadir nueva fuente de noticias"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Recetas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " dĆ­as"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -3058,25 +3339,25 @@ msgstr "Este Feed ya se ha aƱadido a la receta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "Entrada incorrecta"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>No se puede crear la receta. Error:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Reemplazar la receta?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr "una receta personalizada llamada %s ya existe. Quiere reemplazarla?"
 
@@ -3088,7 +3369,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr "Seleccionar un archivo de receta"
 
@@ -3331,52 +3612,62 @@ msgstr "En espera..."
 msgid "Working"
 msgstr "Procesando..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "No se puede detener este trabajo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "TamaƱo (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Fecha"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "ValoraciĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Ninguno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> de %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Marca de tiempo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 "BĆŗsqueda (Para Busqueda Avanzada, haga click en el boton de la izquierda)"
@@ -3406,7 +3697,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>No </b>se han encontrado coincidencias para \"<i>%s</i>\"."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "No se han encontrado coincidencias"
 
@@ -3431,12 +3722,12 @@ msgid "Previous Page"
 msgstr "PƔgina anterior"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "AtrƔs"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Siguiente"
 
@@ -3445,7 +3736,7 @@ msgid "Next match"
 msgstr "Siguiente coincidencia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Abrir eBook"
 
@@ -3453,23 +3744,27 @@ msgstr "Abrir eBook"
 msgid "Configure"
 msgstr "Configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Error en la comunicaciĆ³n con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3477,126 +3772,126 @@ msgstr ""
 "<p>Para mas ayuda, visite <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "Enviar a la memoria interna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "Enviar a la tarjeta de memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr "y borrar de la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "enviar a la tarjeta de almacenamiento por defecto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Editar metadatos individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Edita metadatos en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "aƱadir libros desde un Ćŗnico directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"AƱadir libros de manera recursiva (un libro por directorio, asumiendo que "
-"cada archivo del directorio es el mismo libro en diferente formato)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"AƱadir libros de manera recursiva (Multiples libros por directorio, "
-"asumiendo que cada archivo es un libro diferente)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Guardar en el disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Guardar en el disco, en un Ćŗnico directorio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Guardar solamente el formato %s en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Mostrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Ver formato especĆ­fico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Convertir individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Convertir en bloque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " detectado."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Conectado "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "Base de datos del dispositivo corrupta"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3626,8 +3921,25 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3635,99 +3947,118 @@ msgstr ""
 "<p>Ya existen libros con el mismo tĆ­tulo en la base de datos. ĀæAƱadirlo de "
 "todas formas?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Ā”Duplicados encontrados!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "Enviando libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "No hay espacio en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>No se pueden guardar los libros porque no hay espacio en el dispositivo "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "Eliminando libros del dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "No se pueden editar los metadatos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "No hay libros seleccionados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "Enviando libros al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "No hay formatos adecuados"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3735,15 +4066,15 @@ msgstr ""
 "No se pudieron enviar los siguientes libros al dispositivo, ya que no se "
 "hallaron formatos adecuados: <br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "No se puede guardar en disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3751,59 +4082,64 @@ msgstr ""
 "<p>No se pudieron guardar los siguientes libros en disco, porque el formato "
 "%s no estĆ” disponible para ellos:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "No se pudieron guardar algunos ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "Buscando noticias de "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Seleccione un libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "No se puede visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Elija el formato para visualizar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s no tiene formatos disponibles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "No se puede configurar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "No se puede configurar con trabajos en proceso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "Base de datos no valida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -3811,24 +4147,24 @@ msgstr ""
 "<p>Ya existe una base de datos no valida en %s, bĆ³rrela antes de intentar "
 "mover la base de datos existente. <br>Error: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "No se puede mover la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "No hay informaciĆ³n detallada disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "No hay informaciĆ³n detallada disponible para los libros en el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Error de comunicaciĆ³n con el dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -3836,23 +4172,23 @@ msgstr ""
 "Hubo un error de comunicaciĆ³n con el dispositivo. Desconecte, vuelva a "
 "conectar el dispositivo y reinicie la aplicaciĆ³n."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Error de conversiĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "No existe la base de datos"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -3860,38 +4196,38 @@ msgstr ""
 "El directorio en el que se deberĆ­a encontrar la base de datos, %s ya no "
 "existe. Por favor selecciĆ³ne una nueva ruta para la base de datos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -3899,7 +4235,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">ƚltima versiĆ³n: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -3909,39 +4245,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuevas "
 "caracterƭsticas</a>. Visita la pƔgina de descarga?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "ActualizaciĆ³n disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "BĆŗsqueda avanzada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Buscar:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -3949,7 +4285,7 @@ msgstr ""
 "Busca libros por tĆ­tulo o autor. <br><br>Los espacios entre palabras se "
 "sustituyen por AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -3957,75 +4293,99 @@ msgstr ""
 "Buscar libros por tĆ­tulo, autor, editorial, etiquetas y "
 "comentaris<br><br>Los espacios entre parlabras se sustituyen por AND."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Reinicializar bĆŗsqueda rĆ”pida"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "AƱadir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Suprimir libros"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Borrar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Editar la meta-informaciĆ³n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "Enviar al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Descargar noticias (RSS)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "Convertir Ebooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -4039,23 +4399,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "ERROR: ExcepciĆ³n no Contemplada"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Trabajos:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Haga click para ver los trabajos activos."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Haga click para explorar los libros por sus cubiertas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Haga click para desactivar la exploraciĆ³n de cubiertas"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4063,7 +4423,7 @@ msgstr ""
 "<p>La exploraciĆ³n de los libros por sus cubiertas estĆ” desactivada. <br>La "
 "importaciĆ³n del mĆ³dulo de pictureflow ha fallado:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -4206,7 +4566,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4230,109 +4590,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "ExpresiĆ³n regular no vĆ”lida"
@@ -4341,35 +4705,36 @@ msgstr "ExpresiĆ³n regular no vĆ”lida"
 msgid "Invalid regular expression: %s"
 msgstr "ExpresiĆ³n regular no valida: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Biblioteca"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Sony Reader\n"
-"%s disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Tarjeta\n"
-"%s disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr "Haga click para ver la lista de libros disponibles en su ordenador"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr "Haga click para ver la lista de libros disponibles en su lector"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Haga click para ver la lista de libros en la tarjeta de almacenamiento de su "
@@ -4399,6 +4764,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4660,79 +5029,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "No se ha podido abrir el proceso trabajador."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sUso%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Creado por "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr "No se ha podido inicializar la biblioteca fontconfig"
 
@@ -4752,13 +5129,13 @@ msgstr "No se ha podido negociar perĆ­odo de sesiones SSH: "
 msgid "Failed to authenticate with server: %s"
 msgstr "No se ha podido autenticar con el servidor: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Newsfeed desconocido"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "ArtĆ­culo sin tĆ­tulo"
 
@@ -4771,7 +5148,7 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -4780,7 +5157,7 @@ msgstr ""
 "Por omisiĆ³n es %default segundo(s)"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -4789,7 +5166,7 @@ msgstr ""
 "omisiĆ³n %s segundos"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -4798,7 +5175,7 @@ msgstr ""
 "descargar. Por omisiĆ³n se intentarĆ” averiguar la codificaciĆ³n."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4810,7 +5187,7 @@ msgstr ""
 "enlaces se siguen."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4825,7 +5202,7 @@ msgstr ""
 "so usadas, entonces --filter-regexp se aplica primero."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "No descargar hojas de estilo CSS"
 
@@ -4960,70 +5337,70 @@ msgid "Dont show the progress bar"
 msgstr "No mostrar la barra de progreso"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "Buscando newsfeeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Fuente de noticias desconocida"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Descarga finalizada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "Error al descargar los siguientes artĆ­culos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " de "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Error al descargar partes de los siguientes artĆ­culos"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tEnlaces erroneos:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 "No se pudo obtener el artĆ­culo. Ejecute con la opciĆ³n --debug para encontrar "
 "la causa del fallo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "Feeds obtenidos de pƔgina ƭndice"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "Intentando descargar la portada"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Iniciando la descarga [%d hilo(s)]"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feeds descargados a %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "No fuƩ posible descargar la portada: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "Descargando portada desde %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "ArtĆ­culo sin tĆ­tulo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -5033,23 +5410,23 @@ msgstr ""
 "ArtĆ­culo %s descargado desde %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "ArtĆ­culo descargado: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "No se ha podido descargar el artĆ­culo: %s de %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Error en la descarga del artĆ­culo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "Buscando newsfeed"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -5059,11 +5436,11 @@ msgstr ""
 "\n"
 "Donde URL es por ejemplo http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Directorio base en el cual se almacena URL. Por omisiĆ³n es %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -5071,7 +5448,7 @@ msgstr ""
 "MĆ”ximo nĆŗmero de niveles de recursiĆ³n, es decir, profundidad de los enlaces "
 "a seguir. Por omisiĆ³n %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5079,7 +5456,7 @@ msgstr ""
 "El nĆŗmero mĆ”ximo de archivos a descargar. Esto se aplica solamente a "
 "archivos procedentes de una etiqueta <a href>. Por omisiĆ³n es %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 
@@ -5135,6 +5512,9 @@ msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "&UbicaciĆ³n de la base de datos (library1.db)"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&Prioridad para los trabajos de conversiĆ³n:"
+
 #~ msgid "&Access Key;"
 #~ msgstr "Clave de &acceso;"
 
@@ -5207,6 +5587,20 @@ msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Los cambios no se aplicaran hasta reiniciar."
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "AƱadir libros de manera recursiva (un libro por directorio, asumiendo que "
+#~ "cada archivo del directorio es el mismo libro en diferente formato)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "AƱadir libros de manera recursiva (Multiples libros por directorio, "
+#~ "asumiendo que cada archivo es un libro diferente)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Noticias adquiridas. Enviando al dispositivo."
 
@@ -5221,6 +5615,23 @@ msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 #~ msgid "Custom news sources"
 #~ msgstr "Nueva fuente de noticias personalizada"
 
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Sony Reader\n"
+#~ "%s disponible"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Tarjeta\n"
+#~ "%s disponible"
+
 #~ msgid "Job killed by user"
 #~ msgstr "Trabajo detenido por el usuario"
 
@@ -5304,6 +5715,29 @@ msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 #~ msgid " does not allow copying of text."
 #~ msgstr " no permite copiar texto."
 
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+
 #~ msgid ""
 #~ "Path to the calibre database. Default is to use the path stored in the "
 #~ "settings."
@@ -5455,6 +5889,9 @@ msgstr "Mostrar informaciĆ³n de salida detallada. ƚtil para depuraciĆ³n"
 #~ "SONY PRS-500 con un tamaƱo de pantalla de 584x754 pƭxeles. Las opciones son "
 #~ "%s"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Solicitar &confirmaciĆ³n antes de eliminar archivos"
+
 #~ msgid "Send downloaded periodical content to device automatically"
 #~ msgstr ""
 #~ "Enviar contenido descargado periodicamente al dispositivo automaticamente"
diff --git a/src/calibre/translations/fr.po b/src/calibre/translations/fr.po
index f86311d97a..f60b721485 100644
--- a/src/calibre/translations/fr.po
+++ b/src/calibre/translations/fr.po
@@ -6,56 +6,232 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-08-28 13:18+0000\n"
-"Last-Translator: Anthony GuƩchoum <Unknown>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-31 14:45+0000\n"
+"Last-Translator: Arnaud Bonatti <arnaud.bonatti@gmail.com>\n"
 "Language-Team: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Base"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Type de fichier"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Lecteur de mƩtadonnƩes"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+"Configure le greffon. SpƩcifiez le nom du greffon et les arguments, sƩparƩs "
+"par des virgules."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Le lecteur n'a pas de carte de stockage connectƩe."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -69,7 +245,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -77,17 +253,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -96,38 +272,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -135,134 +311,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +397,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +416,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +515,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Utile pour dƩboguer"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -439,7 +581,7 @@ msgstr "ClƩ de tri pour l'auteur"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Ɖditeur"
 
@@ -741,11 +883,11 @@ msgstr ""
 "Windows est le cp-1252. Cela peut aussi ĆŖtre l'utf-8. Le mieux est d'essayer "
 "et deviner quel est l'encodage appropriƩ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -762,122 +904,122 @@ msgstr ""
 "RAR ou ZIP, en recherchant les ebooks Ơ l'intƩrieur de l'archive.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Aucun fichier sƩlectionnƩ Ơ convertir."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 "Titre pour le livre Ʃlectronique crƩƩ. Par dƩfaut le nom de fichier sera "
 "utilisƩ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Nombre de teintes pour la conversion de l'image en Ć©chelle de gris. DĆ©faut: "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -926,56 +1068,56 @@ msgstr "Options pour contrƓler le comportement de html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tAnalyse de l'HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Traitement de %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tConversion en BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Ne peut analyser le fichier: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s est un fichier vide"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Ɖrreur d'analyse du lien %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Ne peut ajouter le lien %s au TOC"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Incapable de traiter l'image %s. Erreur: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -983,12 +1125,12 @@ msgstr ""
 "Ne peut traiter l'image: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -996,11 +1138,11 @@ msgstr ""
 "Mauvaise table:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "La table a une cellule trop grande"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1008,19 +1150,19 @@ msgstr ""
 "Vous devez tout d'abord sauvegarder le site web %s en fichier html, puis le "
 "lancer avec html2lrf."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Ne peut lire l'image de couverture: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Ne peut lire depuis: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Tentative de traitement du fichier opf ƩchouƩe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1258,17 +1400,17 @@ msgstr "Configurer les commentaires."
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Titre"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
@@ -1287,25 +1429,25 @@ msgstr "CatƩgorie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Commentaires"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Tags"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "SĆ©ries"
@@ -1314,23 +1456,23 @@ msgstr "SĆ©ries"
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1427,7 +1569,7 @@ msgstr "Usage: %s file.lit"
 msgid "Cover saved to"
 msgstr "Couverture sauvƩe sur"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1439,11 +1581,11 @@ msgstr "Usage: pdf-meta file.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1452,7 +1594,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "RƩpertoires utilisƩs frƩquemment"
 
@@ -1520,6 +1662,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1555,9 +1709,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Chemin"
 
@@ -1565,8 +1719,8 @@ msgstr "Chemin"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formats"
@@ -1580,6 +1734,7 @@ msgstr "BoƮte de dialogue"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1655,83 +1810,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Mode avancƩ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Chemin de la database invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Doit ĆŖtre un rĆ©pertoire."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Chemin de la database invalide "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Chemin de la database invalide.<br>Erreur en Ć©criture "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Configuration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Choisir un nouvel emplacement pour la base de donnƩes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1747,190 +1963,203 @@ msgstr "Choisir un nouvel emplacement pour la base de donnƩes"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Envoyer une notification quand une nouvelle version est disponible."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&PrioritƩ pour les travaux de conversion :"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "&Timeout par dƩfaut pour les connexions rƩseau :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " secondes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "Ajouter un rƩpetoire Ơ la liste des rƩpertoires utilisƩs frƩquemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Supprime un rƩpetoire de la liste des rƩpertoires utilisƩs frƩquemment"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "Utilisation de chiffres romains pour les numƩro de sƩries"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Large"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Moyen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Petit"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Espace libre non-utilisƩ de la base de donnƩes"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "Nom de l'&utilisateur :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "Mot de &passe :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "&Affiche le mot de passe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1939,6 +2168,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "ERREUR"
@@ -1956,7 +2223,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadata"
 
@@ -2010,25 +2277,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Impossible de lire"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Vous n'avez pas les permissions nƩcessaires pour lire ce fichier: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Erreur Ć  la lecture du fichier"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Il y a eu une erreur Ć  la lecture du fichier : <br /><b>"
 
@@ -2038,7 +2305,7 @@ msgid " is not a valid picture"
 msgstr " n'est pas une image vailde"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Conversion impossible"
 
@@ -2081,22 +2348,22 @@ msgid "Book Cover"
 msgstr "Couverture du livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Utilise l'image de couverture du fichier &source"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Modifie l'image &cover :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Rechercher une image Ć  utiliser en tant que couverture du livre."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Utilise l'image de couverture du fichier &source"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2111,14 +2378,14 @@ msgstr "Modifie le titre du livre"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Auteurs : "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2141,14 +2408,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Editeur : "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Modifie l'Ć©diteur du livre"
@@ -2161,7 +2428,7 @@ msgstr "Ta&gs : "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2172,7 +2439,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&SĆ©ries :"
@@ -2181,8 +2448,8 @@ msgstr "&SĆ©ries :"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2612,25 +2879,25 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Editer les informations Metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Informations (metadata)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "ClƩ de tr&i de l'auteur : "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2639,47 +2906,51 @@ msgstr ""
 "DĆ©finit comment l'auteur de ce livre doit ĆŖtre classĆ©. Par exemple, Charles "
 "Dickens peut ĆŖtre classĆ© comme Dickens, Charles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Note :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Note de ce livre. de 0 Ć  5 Ć©toiles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " Ć©toiles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "Ajout de Ta&gs : "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Ouvre l'Ć©diteur de mots-clefs"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "&Supprime des mots-clefs :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr "Liste de mots-clefs sƩparƩs par des virgules Ơ retirer des livres. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2689,19 +2960,19 @@ msgstr ""
 "<b>LibraryThing.com</b>. <br/>Si vous n'en avez pas, vous pouvez <a "
 "href='http://www.librarything.com'>y crƩer un compte </a> gratuitement !</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Erreur Ơ la rƩcupƩration de l'image de couverture.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Erreur Ơ la rƩcupƩration de l'image de couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Erreur Ơ la rƩcupƩration de l'image de couverture"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Vous devez fournir l'identifiant ISBN de ce livre."
 
@@ -2766,93 +3037,112 @@ msgstr "Modifie le mot de passe"
 msgid "Password needed"
 msgstr "Mot de passe nƩcessaire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -3005,25 +3295,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -3035,7 +3325,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3265,52 +3555,62 @@ msgstr "En attente"
 msgid "Working"
 msgstr "En cours"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "Taille (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Date"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Note"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Aucun"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Livre <font face=\"serif\">%s</font> of %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Horodatage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3339,7 +3639,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Aucun rƩsultat</b> pour la recherche <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Aucun rƩsultat"
 
@@ -3364,12 +3664,12 @@ msgid "Previous Page"
 msgstr "Page prƩcƩdente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "Recule"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Avance"
 
@@ -3378,7 +3678,7 @@ msgid "Next match"
 msgstr "RĆ©sultat suivant"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Ouvrir le livre"
 
@@ -3386,148 +3686,152 @@ msgstr "Ouvrir le livre"
 msgid "Configure"
 msgstr "Configuration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Erreur pendant la communication avec le lecteur Ć©lectronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "Envoi vers la mƩmoire du lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "Envoi vers la carte mƩmoire"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Edition des metadata individuellement"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Edition des metadata par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"Ajouter des livres rƩcursivement (un livre par rƩpertoire, assume que chaque "
-"fichier correspond au mĆŖme livre mais dans un format diffĆ©rent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"Ajouter des livre rĆ©cursivement (Plusieurs livres par rĆ©pertoire, considĆØre "
-"que chaque fichier est un livre diffƩrent)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Enregistrer sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Convertion individuelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Convertion par lot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3543,8 +3847,25 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3552,172 +3873,196 @@ msgstr ""
 "<p>Des livres ayant le mĆŖme titre existent dĆ©jĆ  dans la base de donnĆ©es. Les "
 "ajouter quand mĆŖme ?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Des doublons ont ƩtƩ dƩtectƩs !"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "Le lecteur Ʃlectronique n'a plus d'espace mƩmoire disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Impossible d'envoyer les livres sur le lecteur : il n'y a plus assez "
 "d'espace mƩmoire disponible "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Erreur Ć  l'Ć©dition des metadat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Aucun livre sƩlectionnƩ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Ne peut pas enregistrer sur le disque"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Impossible de sauvegarder des livres Ć©lectroniques"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Aucun livre sƩlectionnƩ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Impossible de visualiser"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Configuration impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossible de configurer pendant que des travaux sont en cours."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "Base de donnƩes invalide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -3725,23 +4070,23 @@ msgstr ""
 "<p>Une base de donnƩes invalide existe dƩjƠ ici : %s, spprimez la avant "
 "d'essayer de dƩplacer la base de donnƩes existante.<br>Erreur : %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "DƩplacement de la base de donnƩes impossible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Erreur pendant la communication avec le lecteur Ć©lectronique"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -3750,105 +4095,105 @@ msgstr ""
 "lecteur Ʃlectronique. Veuillez dƩconnecter et reconnecter le lecteur "
 "Ʃlectronique et redƩmarrer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Recherche :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -3856,7 +4201,7 @@ msgstr ""
 "Recherche les livres par titre ou auteur <br><br>Recherche en ET pour les "
 "mots sƩparƩs par des espaces."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -3864,75 +4209,99 @@ msgstr ""
 "Recherche les livres par titre, auteur, Ć©diteur, tags et commentaires "
 "<br><br>Recherche en ET pour les mots sƩparƩs par des espaces."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "RĆ©initialisation de la recherche rapide"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "Ajout d'un livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Suppression du livre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Suppression"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Edition des metadata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "Envoyer au lecteur"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "RƩcupƩrer des News"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3943,29 +4312,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Travaux :"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -4108,7 +4477,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4132,109 +4501,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4243,35 +4616,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Librairie"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Lecteur \n"
-"%s disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Carte\n"
-"%s disponible"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4299,6 +4673,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4526,79 +4904,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sUsage%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "CrƩƩ par "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4618,13 +5004,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4637,28 +5023,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4666,7 +5052,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4676,7 +5062,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4773,114 +5159,114 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
@@ -4938,6 +5324,9 @@ msgstr ""
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "&Emplacement de la base de donnƩes (library1.db)"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&PrioritƩ pour les travaux de conversion :"
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Access Key;"
 
@@ -4955,6 +5344,23 @@ msgstr ""
 #~ "<b>Les modifications ne seront prises en compte qu'aprĆØs avoir relancĆ© le "
 #~ "programme."
 
+#~ msgid "Library"
+#~ msgstr "Librairie"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Lecteur \n"
+#~ "%s disponible"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Carte\n"
+#~ "%s disponible"
+
 #~ msgid "%s is not available in LRF format. Please convert it first."
 #~ msgstr "%s n'est pas disponible au format LRF. Veuillez le convertir avant."
 
diff --git a/src/calibre/translations/gl.po b/src/calibre/translations/gl.po
index 428b4f9d30..b8ad5b1fd8 100644
--- a/src/calibre/translations/gl.po
+++ b/src/calibre/translations/gl.po
@@ -7,32 +7,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-09-30 12:33+0000\n"
 "Last-Translator: Calidonia <Unknown>\n"
 "Language-Team: Galician <gl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Non se puido detectar a unidade de disco %s. Probe a reiniciar."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "O lector non ten conectada tarxeta de almacenamento ningunha"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "OpciĆ³ns para controlar a conversiĆ³n a EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -40,7 +214,7 @@ msgstr ""
 "Se non se especifica o ficheiro EPUB de saĆ­da empregarase o mesmo nome do "
 "ficheiro de entrada."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -50,17 +224,17 @@ msgstr ""
 "para crear un EPUB independente do dispositivo. O perfil Ćŗsase para "
 "establcer restriciĆ³ns especĆ­ficas no EPUB. As opciĆ³ns son: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -74,7 +248,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -82,17 +256,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -101,38 +275,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -140,134 +314,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -278,8 +400,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -292,93 +419,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -391,28 +518,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -442,7 +582,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr ""
 
@@ -683,11 +823,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -698,118 +838,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -850,95 +990,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1137,17 +1277,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1166,25 +1306,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1193,23 +1333,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1288,7 +1428,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1300,11 +1440,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1313,7 +1453,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1381,6 +1521,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1416,9 +1568,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1426,8 +1578,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1441,6 +1593,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1516,83 +1669,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1608,189 +1822,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1799,6 +2026,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1816,7 +2081,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1870,25 +2135,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1898,7 +2163,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1939,22 +2204,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1969,14 +2234,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1997,14 +2262,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2017,7 +2282,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2026,7 +2291,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2035,8 +2300,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2449,91 +2714,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2595,93 +2864,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2831,25 +3119,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2861,7 +3149,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3091,52 +3379,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3165,7 +3463,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3190,12 +3488,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3204,7 +3502,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3212,144 +3510,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3365,383 +3671,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3752,29 +4123,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3917,7 +4288,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3941,109 +4312,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4052,31 +4427,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4104,6 +4484,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4331,79 +4715,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4423,13 +4815,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4442,28 +4834,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4471,7 +4863,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4481,7 +4873,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4578,113 +4970,113 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
diff --git a/src/calibre/translations/it.po b/src/calibre/translations/it.po
index 3172873320..2c965f57f8 100644
--- a/src/calibre/translations/it.po
+++ b/src/calibre/translations/it.po
@@ -8,33 +8,211 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre_calibre-it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-28 18:13+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2009-01-01 18:58+0000\n"
 "Last-Translator: Iacopo Benesperi <Unknown>\n"
 "Language-Team: italiano\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Non fa assolutamente niente"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Base"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Tipo di file"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Lettore metadati"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Scrittore metadati"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Legge i metadati da file %s"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr "Estrae le copertine dai file dei fumetti"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr "Imposta i metadati nei file EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr "Imposta i metadati nei file LRF"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr "Imposta i metadati nei file RTF"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "Plug-in installati"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Disabilita plug-in"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+"    %prog opzioni\n"
+"    \n"
+"    Personalizza calibre caricando plug-in esterni.\n"
+"    "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr "Elenca tutti i plug-in installati"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Impossibile individuare il disco %s. Provare a riavviare."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Il lettore non ha una scheda di memoria connessa."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Opzioni per controllare la conversione in EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -42,7 +220,7 @@ msgstr ""
 "Il file EPUB in uscita. Se non viene specificato, viene ricavato dal nome "
 "del file in ingresso."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -52,7 +230,7 @@ msgstr ""
 "Nessuno per creare un EPUB indipendente dal dispositivo. Il profilo ĆØ usato "
 "per restrizioni specifiche dei dispositivi per l'EPUB. Le scelte sono: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
@@ -60,11 +238,11 @@ msgstr ""
 "Il percorso a un foglio di stile CSS o istruzioni CSS dirette. Questo CSS "
 "sovrascriverĆ  tutte le impostazioni del foglio di stile incluso nel sorgente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Controlla il rilevamento automatico della struttura del documento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -88,7 +266,7 @@ msgstr ""
 "calibre per ulteriori\n"
 "informazioni sull'utilizzo di questa funzionalitĆ .\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -101,11 +279,11 @@ msgstr ""
 "marcatura dei capitoli e il valore \"both\" userĆ  sia l'interruzione di "
 "pagina che la linea per marcare i capitoli."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr "Percorso alla copertina da usare per questo libro"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
@@ -113,7 +291,7 @@ msgstr ""
 "Usare la copertina rilevata dal file di origine al posto di quella "
 "specificata."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -125,7 +303,7 @@ msgstr ""
 "Se viene rilevato un file OPF che specifica il sommario,\n"
 "verrĆ  usato quello del file invece di tentarne l'auto-rilevazione.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
@@ -136,19 +314,19 @@ msgstr ""
 "solo se viene rilevato un numero di capitoli inferiore al numero impostato "
 "in --toc-threshold."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Non aggiungere i capitoli rilevati automaticamente al sommario."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
-"Se viene rilevato un numero di capitoli inferiore a questo numero, i link "
-"verranno aggiunti al sommario."
+"Se viene rilevato un numero di capitoli inferiore a questo, i collegamenti "
+"saranno aggiunti al sommario. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
@@ -158,7 +336,7 @@ msgstr ""
 "sommario al primo livello. Se viene specificata, prende la precedenza sulle "
 "altre forme di autorilevamento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
@@ -168,7 +346,7 @@ msgstr ""
 "sommario al secondo livello. Ogni elemento viene aggiunto sotto l'elemento "
 "di primo livello precedente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -180,7 +358,7 @@ msgstr ""
 "Vedere http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX per "
 "un'introduzione al formato NCX."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
@@ -190,27 +368,27 @@ msgstr ""
 "posto di quello autorilevato. Con questa opzione, verrĆ  usato il sommario "
 "autorilevato."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr "Controlla la struttura della pagina"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr "Imposta il margine superiore in punti. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr "Imposta il margine inferiore in punti. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr "Imposta il margine sinistro in punti. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr "Imposta il margine destro in punti. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
@@ -218,7 +396,7 @@ msgstr ""
 "La dimensione del font di base in punti. Predefinito: %default pt. Impostare "
 "a 0 per disabilitare il ridimensionamento dei font."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
@@ -226,7 +404,7 @@ msgstr ""
 "Rimuove gli spazi tra i paragrafi. Non funzionerĆ  se il sorgente forza la "
 "spaziatura tra i paragrafi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
@@ -237,93 +415,37 @@ msgstr ""
 "selettori interconnessi. Se si abilita questa opzione, i tempi di "
 "processamento dei file diventeranno molto piĆ¹ lunghi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr "Scrive il file OPF generato nello stdout"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr "Scrive il file NCX generato nello stdout"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr "Mantiene i file intermedi durante il processamento con html2epub"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 "Estrae i contenuti del file EPUB prodotto nella cartella specificata."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
-msgstr ""
-"%%prog [opzioni] nome_file\n"
-"\n"
-"Converte uno qualsiasi di una vasta gamma di formati di libri in un file "
-"epub. Formati supportati: %s\n"
+msgstr "%%prog [opzioni] nomefile\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr "Impossibile trovare un libro dentro l'archivio"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -341,8 +463,13 @@ msgstr ""
 "presa\n"
 "dall'elemento <spine> del file OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr "Output scritto in "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "ƈ necessario specificare un file HTML"
 
@@ -357,7 +484,7 @@ msgstr ""
 "Impossibile trovare un buon punto dove dividere: %s Dimensione sotto-albero: "
 "%d KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
@@ -365,24 +492,24 @@ msgstr ""
 "\t\tTroppo markup. Divido di nuovo senza preservare la struttura. Questo "
 "potrebbe portare a problemi nella visualizzazione."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "HTML processato scritto in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Opzioni per controllare l'analisi completa dell'HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "Cartella in uscita. Predefinita: cartella corrente"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Codifica caratteri per i file HTML. Predefinito: rilevamento automatico."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -390,11 +517,11 @@ msgstr ""
 "Crea l'output in un file zip. Se questa opzione ĆØ specificata, --output "
 "dovrebbe essere il nome di un file, non di una cartella."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Controlla come vengono seguiti i link nei file HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -402,7 +529,7 @@ msgstr ""
 "Analizza tutti i link nei file HTML in ordine di grandezza. Normalmente, i "
 "link sono analizzati in ordine di profonditĆ "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -410,39 +537,39 @@ msgstr ""
 "Massimo livello di ricorsivitĆ  nel seguire i link in HTML. Deve essere un "
 "numero non negativo. 0 significa che i link non vengono seguiti."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Impostare i metadati del libro generato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Impostare il titolo. Predefinito: rilevato automaticamente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "L'autore(i) del libro, sottoforma di un elenco separato da virgole."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Il soggetto(i) di questo libro, come elenco separato da virgole."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr "Impostare l'editore di questo libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr "Un riassunto di questo libro."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr "Carica i metadati dal file OPF specificato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Opzioni utili per il debugging"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -450,13 +577,13 @@ msgstr ""
 "PiĆ¹ dettagliato durante il processo. PuĆ² essere specificato piĆ¹ volte per "
 "aumentare il dettaglio."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Rendere l'HTML in uscita \"ben stampato\", per una comprensione piĆ¹ facile "
 "da parte dell'uomo"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -477,30 +604,44 @@ msgstr ""
 "Se invece viene specificato un file OPF, sarĆ  usata la lista di file nel suo "
 "elemento <spine>.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr "Creazione di file LIT da EPUB in corso..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
 msgstr "%prog [opzioni] FILELIT"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Cartella in uscita. Predefinita: cartella corrente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
 "markup estratto in formato leggibile. Potrebbe modificare spazi vuoti "
 "significativi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Utile per il debugging"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "Libro OEB creato in"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr "%prog [opzioni] FILEOPF"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+"File in uscita. Il nome predefinito ĆØ derivato da quello in ingresso."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Imposta il titolo. Predefinito: nome del file"
@@ -532,7 +673,7 @@ msgstr "Chiave per la classificazione dell'autore"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Editore"
 
@@ -850,11 +991,11 @@ msgstr ""
 "comune per i computer Windows ĆØ cp-1252. Un'altra scelta comune ĆØ utf-8. "
 "L'opzione predefinita ĆØ quella di provare ad indovinare la codifica"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr "La conversione da %s a LRF non ĆØ supportata."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -871,19 +1012,19 @@ msgstr ""
 "archivio RAR o ZIP, cercando i libri dentro l'archivio.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Nessun file da convertire specificato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "Trasformato %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "Fallito %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
@@ -893,58 +1034,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Opzioni per controllare la conversione dei file di fumetti (CBR, CBZ) in "
 "libri"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr "Titolo per il libro generato. Predefinito: nome del file."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Imposta l'autore nei metadati del libro generato. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 "Percorso del file in uscita. Per impostazione predefinita viene creato nella "
 "cartella corrente."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Numero di colori per conversione immagine in scala di grigi. Predefinito: "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Disabilita la normalizzazione dell'intervallo dei colori per le immagini "
 "(migliora il contrasto). Predefinito: falso."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "Mantieni le proporzioni dell'immagine. Predefinito: riempimento dello "
 "schermo."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "Disabilita maschera di nitidezza."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Non dividere le immagini orizzontali in due immagini verticali"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -952,7 +1093,7 @@ msgstr ""
 "Mantieni le proporzioni e scala l'immagine usando l'altezza dello schermo "
 "come larghezza dell'immagine per la visualizzazione in orizzontale."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -961,7 +1102,7 @@ msgstr ""
 "divisione di una pagina orizzontale in due pagine verticali orientate da "
 "destra a sinistra."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -969,7 +1110,7 @@ msgstr ""
 "Abilita Despeckle. Riduce il rumore speckle. PuĆ² aumentare di molto il tempo "
 "di processamento."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -977,7 +1118,7 @@ msgstr ""
 "Non ordinare i file trovati nel fumetto alfabeticamente per nome. Usa invece "
 "l'ordine in cui sono stati aggiunti al fumetto."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
@@ -988,7 +1129,7 @@ msgstr ""
 "584x754 pixel. Questo profilo va bene per qualsiasi dispositivo con uno "
 "schermo della stessa dimensione. Le scelte sono: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -996,11 +1137,11 @@ msgstr ""
 "Sii dettagliato, utile per il debugging. PuĆ² essere specificato piĆ¹ volte "
 "per dettagli maggiori."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Non visualizzare la barra di progresso."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
@@ -1010,11 +1151,11 @@ msgstr ""
 "\n"
 "Converte un fumetto in formato CBZ o CBR in un libro. \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Output scritto in"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Trasformazione pagine fumetto..."
 
@@ -1064,56 +1205,56 @@ msgstr "Opzioni per controllare il comportamento di html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr "Scaricamento della formula fallito: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tFile di Book Designer individuato"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tAnalisi HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tFile di Baen individuato. Rianalizzo..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "HTML preprocessato scritto in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Sto processando %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tConversione in BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Impossibile analizzare il file: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%S ĆØ un file vuoto"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Analisi fallita del link %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Impossibile aggiungere il link %s alla TOC"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Impossibile processare l'immagine %s. Errore: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Impossibile processare la PNG interlacciata %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1121,14 +1262,14 @@ msgstr ""
 "Impossibile processare l'immagine: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "Si ĆØ verificato un errore nel processamento della tabella: %s. Ignoro il "
 "codice della tabella"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1136,11 +1277,11 @@ msgstr ""
 "Tabella malformata:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "La tabella ha celle troppo larghe"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1148,19 +1289,19 @@ msgstr ""
 "ƈ necessario prima salvare il sito web %s come un file HTML e poi eseguire "
 "html2lrf su di esso"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Impossibile leggere l'immagine di copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Impossibile leggere da: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Processamento del file OPF fallito"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1406,17 +1547,17 @@ msgstr "Imposta il commento"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Titolo"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Autore(i)"
 
@@ -1435,25 +1576,25 @@ msgstr "Categoria"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Commenti"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Tag"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Serie"
@@ -1462,23 +1603,23 @@ msgstr "Serie"
 msgid "Language"
 msgstr "Lingua"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr "Una lista separata da virgole di tag da impostare"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr "La serie a cui questo libro appartiene"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr "L'indice della serie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr "La lingua del libro"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr "Estrai la copertina"
 
@@ -1575,7 +1716,7 @@ msgstr "Uso: %s file.lit"
 msgid "Cover saved to"
 msgstr "Copertina salvata in"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr "Imposta il campo dc:language"
 
@@ -1587,11 +1728,11 @@ msgstr "Uso: pdf-meta-file.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr "Uso: rb-meta file.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opzioni] miolibro.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "MOBI HTML raw salvato in"
 
@@ -1600,7 +1741,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr "La cartella di uscita. La cartella predefinita ĆØ quella corrente."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "Cartelle usate frequentemente"
 
@@ -1672,6 +1813,19 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr "Notizie piĆ¹ vecchie da mantenere nel database"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "Mostra un'icona nel vassoio di sistema"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "Carica le notizie scaricate sul dispositivo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+"Elimina i libri dalla biblioteca dopo averle caricate sul dispositivo"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "Dispositivo non piĆ¹ collegato."
@@ -1707,9 +1861,9 @@ msgstr "Visualizza libro sul dispositivo"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Percorso"
 
@@ -1717,8 +1871,8 @@ msgstr "Percorso"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formati"
@@ -1732,6 +1886,7 @@ msgstr "Finestra di dialogo"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1808,19 +1963,27 @@ msgstr "De&speckle"
 msgid "&Wide"
 msgstr "&Largo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
-msgstr "Generale"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr " plug-in"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr "Interfaccia"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr "di"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Avanzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "Generale"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Interfaccia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
@@ -1828,50 +1991,103 @@ msgstr ""
 "Server dei\n"
 "contenuti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr "Plug-in"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr "Personalizza %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr "File di log degli errori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr "File di log degli accessi:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr "Avvio del server dei contenuti fallito"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "Dimensione non valida"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+"La dimensione %s non ĆØ valida. Deve essere nella forma larghezzaxaltezza"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Percorso database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Deve essere una cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Percorso database non valido "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Percorso database non valido.<br>Impossibile scrivere su "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Compattazione database. Poterbbe richiedere un po' di tempo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Compattazione..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1879,16 +2095,17 @@ msgstr ""
 "Per&corso dei libri (I libri sono salvati in cartelle salvate per autore e i "
 "metadati sono salvati nel file metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Sfoglia per specificare una nuova posizione del database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1904,45 +2121,35 @@ msgstr "Sfoglia per specificare una nuova posizione del database"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "&Visualizza un avvertimento quando ĆØ disponibile una nuova versione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "&Chiedere conferma prima di eliminare i file"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
-"Se si disabilita questa impostazione, i metadati saranno indovinati dal nome "
-"del file. Questa impostazione puĆ² essere configurata nella sezione Avanzata."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr "Leggi &metadati dai file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "&Formato per salvataggio singolo file:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "Pri&oritĆ  per i lavori di conversione:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "&Timeout predefinito della rete:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -1950,94 +2157,105 @@ msgstr ""
 "Imposta il timeout predefinito per gli scaricamenti dalla rete (cioĆØ ogni "
 "volta che si usa Internet per prelevare informazioni)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " secondi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr "Scegliere la ling&ua (richiede il riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
-msgstr "Il formato predefinito per la conversione dei libri."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "Normale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Massima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "Minima"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr "&Formato in uscita:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "&PrioritĆ  lavoro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "Aggiunge una cartella alla lista delle cartelle usate frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Rimuove una cartella dalla lista delle cartelle usate frequentemente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "&Usa numeri romani per i numeri delle serie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 "&Numero di copertine da visualizzare nella modalitĆ  di sfogliatura (richiede "
 "riavvio):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Grande"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Media"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Piccola"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "&Dimensione bottoni nella barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "&Mostra testo nei bottoni della barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "&Selezionare le colonne visibili nella vista biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr "&Usa il lettore interno per i seguenti formati:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr "Abilita l'icona nel vassoio di sistema (richiede il riavvio)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "Invia automaticamente le noti&zie scaricate al lettore di libri"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "&Elimina le notizie dalla biblioteca dopo averle inviate al lettore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Libera lo spazio non utilizzato dal database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "&Compatta database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Metadati dal nome del file"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2048,23 +2266,23 @@ msgstr ""
 "Qualsiasi cambiamento nella configurazione verrĆ  attivato solo dopo il "
 "riavvio del server."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr "&Porta del server:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "&Nome utente:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&Password:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2072,33 +2290,45 @@ msgstr ""
 "Se si lascia la password in bianco, chiunque potrĆ  accedere alla propria "
 "collezione di libri utilizzando l'interfaccia web."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "&Mostra password"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+"La dimensione massima (larghezzaxaltezza) per le copertine visualizzate. Le "
+"copertine piĆ¹ larghe vengono ridimensionate. "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr "Dimensi&one massima copertina:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr "A&vvia il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr "&Ferma il server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr "&Test sul server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr "Avvia a&utomaticamente il server all'apertura"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr "Visualizza i file di l&og del server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2112,6 +2342,44 @@ msgstr ""
 "proprio iphone. Mionomehost deve essere il nome host completo o l'indirizzo "
 "IP del computer."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr "&Aggiungi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr "Si ĆØ sicuri?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "ERRORE"
@@ -2129,7 +2397,7 @@ msgstr "Converte %s in EPUB"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadati"
 
@@ -2191,25 +2459,25 @@ msgstr "Seleziona copertina per "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Impossibile leggere"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Non si hanno i permessi per leggere il file: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Errore nella lettura del file"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Si ĆØ verificato un errore nella lettura del file: <br /><b>"
 
@@ -2219,7 +2487,7 @@ msgid " is not a valid picture"
 msgstr " non ĆØ un'immagine valida"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Impossibile convertire"
 
@@ -2261,23 +2529,23 @@ msgid "Book Cover"
 msgstr "Copertina del libro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Usa copertina del file di &origine"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Ca&mbia l'immagine di copertina:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 "Sfoglia per trovare un'immagine da usare come copertina per questo libro"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Usa copertina del file di &origine"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2292,14 +2560,14 @@ msgstr "Cambia il titolo di questo libro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "A&utore(i): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2325,14 +2593,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Editore: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Cambia l'editore di questo libro"
@@ -2345,7 +2613,7 @@ msgstr "T&ag: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2357,7 +2625,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Serie:"
@@ -2366,8 +2634,8 @@ msgstr "&Serie:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2812,8 +3080,8 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2823,24 +3091,24 @@ msgstr ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "&Classificazione autore: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2849,47 +3117,51 @@ msgstr ""
 "Specifica come deve essere classificato l'autore di questo libro. Ad "
 "esempio, Charles Dickens deve essere classificato come Dickens, Charles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Giudizio:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Giudizio su questo libro. 0-5 stelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " stelle"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "&Aggiungi tag: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Apri l'editor dei tag"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "&Rimuovi tag:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr "Lista separata da virgole dei tag da rimuovere dal libro "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr "Rimuovi for&mato:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr "Imposta a&utomaticamente la Classificazione autore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2899,19 +3171,19 @@ msgstr ""
 "<br/>Se non se ne possiede uno, ĆØ possibile <a "
 "href='http://www.librarything.com'>registrarsi</a> gratuitamente!</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Impossibile scaricare la copertina</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Impossibile scaricare la copertina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Impossibile scaricare la copertina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "ƈ necessario specificare il codice ISBN di questo libro"
 
@@ -2976,63 +3248,82 @@ msgstr "Cambia password"
 msgid "Password needed"
 msgstr "Password necessaria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr "Tu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr "Cerca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr "%d formule"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr "ƈ necessario inserire le informazioni dell'account"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr "Questa formula richiede nome utente e password"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr "Creato da: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr "Ultimo scaricamento: %s giorni fa"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr "Ultimo scaricamento: mai"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr "Programmare lo scaricamento delle notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "Aggiungi una fonte di notizie personalizzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr "Notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Formule"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr "Programma per lo scaricamento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr "titolo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr "descrizione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr "autore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr "&Programma per lo scaricamento ogni:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
@@ -3040,26 +3331,26 @@ msgstr ""
 "Intervallo a cui scaricaricare questa formula. Il valore zero significa che "
 "la formula verrĆ  scaricata ogni ora."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " giorni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr "&Account"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 "PerchƩ la programmazione funzioni, calibre deve essere in esecuzione."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr "&Scarica ora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
@@ -3067,7 +3358,7 @@ msgstr ""
 "Cancella le notizie piĆ¹ vecchie del numero di giorni specificato. Impostare "
 "a zero per disabilitare."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr "Elimina le notizie scaricate piĆ¹ vecchie di "
 
@@ -3225,25 +3516,25 @@ msgstr "Questo feed ĆØ giĆ  stato aggiunto alla formula"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "Input non valido"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>Impossibile creare la formula. Errore:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Sovrascrivere la formula?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr "Esiste giĆ  una formula personalizzata di nome %s. Sovrascriverla?"
 
@@ -3255,7 +3546,7 @@ msgstr "Prendi formula"
 msgid "Pick the recipe to customize"
 msgstr "Prende la formula per personalizzarla"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr "Scegliere un file di formula"
 
@@ -3519,52 +3810,62 @@ msgstr "In attesa"
 msgid "Working"
 msgstr "In esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "Impossibile terminare il lavoro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Impossibile annullare i processi che comunicano col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr "Il lavoro ĆØ giĆ  stato avviato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "Dimensione (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Data"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Giudizio"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Nessuno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Libro <font face=\"serif\">%s</font> di %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr "Non permesso"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Timestamp"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Cerca (Per la ricerca avanzata fare clic sul bottone a sinistra)"
 
@@ -3593,7 +3894,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Nessuna corrispondenza</b> trovata per la frase <i>%s</i>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Nessuna corrispondenza trovata"
 
@@ -3618,12 +3919,12 @@ msgid "Previous Page"
 msgstr "Pagina precedente"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "Indietro"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Avanti"
 
@@ -3632,7 +3933,7 @@ msgid "Next match"
 msgstr "Prossima corrispondenza"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Apri libro"
 
@@ -3640,23 +3941,27 @@ msgstr "Apri libro"
 msgid "Configure"
 msgstr "Configurazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr "&Ripristina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr "&Dona"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr "& Esci"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr "&Riavvia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3664,126 +3969,126 @@ msgstr ""
 "<p>Per aiuto visitare <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s di <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "Invia alla memoria principale"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "Invia alla scheda di memoria"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
-msgstr "e elimina dalla libreria"
+msgstr "ed elimina dalla biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "Invia alla scheda di memoria come imposazione predefinita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Modifica metadati individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Modifica metadati in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "Aggiungi libri da una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"Aggiungi libri ricorsivamente (un libro per cartella, assume che ogni file "
-"sia lo stesso libro in un diverso formato)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"Aggiungi libri ricorsivamente (piĆ¹ libri per cartella, assume che ogni file "
-"sia un libro diverso)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Salva su disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Salva su disco in una singola cartella"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Salva sul disco solo il formato %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Leggi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Leggi uno specifico formato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Converti individualmente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Converti in gruppo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr "Imposta i parametri predefiniti per la conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr "Imposta i parametri predefiniti per la conversione di fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr "Libri simili..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr "Percorso del database sbagliato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
-msgstr "Scegliere un percorso per la propria libreria."
+msgstr "Scegliere un percorso per la propria biblioteca."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr "Esportazione database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "Dispositivo: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " individuato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Connesso "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "Database del dispositivo corrotto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3812,8 +4117,25 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr "Interrompi"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr "Aggiunto "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr "Ricerca in corso ..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3821,100 +4143,119 @@ msgstr ""
 "<p>Nel database sono giĆ  presenti libri con i seguenti titoli. Aggiungerli "
 "ugualmente?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Scoperti duplicati!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "Caricamento libri nel dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr "Libri EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr "Libri LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr "Libri HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr "Libri LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr "Libri MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr "Libri TXT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr "Libri PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr "Fumetti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr "Archivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "Spazio insufficiente sul dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Impossibile salvare libri sul dispositivo perchĆ© non c'ĆØ piĆ¹ spazio "
 "disponibile "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
-msgstr "Conferma elininazione"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr "Si ĆØ sicuri di voler eliminare questi %d libri?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "Cancellamento libri dal dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Impossibile modificare i metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr "Invio notizie al dispositivo in corso."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "Invio libri al dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "Nessun formato adatto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3922,15 +4263,15 @@ msgstr ""
 "Impossibile caricare i seguenti libri nel dispositivo, perchĆ© non ĆØ stato "
 "trovato nessun formato adatto:<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Impossibile salvare sul disco"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr "Scegliere la cartella di destinazione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3938,59 +4279,64 @@ msgstr ""
 "<p>Impossibile salvare i libri seguenti su disco, perchĆ© il formato %s non ĆØ "
 "disponibile per loro:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Impossibile salvare alcuni libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "Scaricamento notizie da "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr " preso."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Nessun libro selezionato"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Impossibile leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Scegliere il formato da leggere"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr "Impossibile aprire la cartella"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s non ha formati disponibili"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Impossibile configurare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Impossibile configurare mentre ci sono lavori in esecuzione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr "Sto copiando il database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copia biblioteca in "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "Database non valido"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -3998,25 +4344,25 @@ msgstr ""
 "<p>Esiste giĆ  un database non valido in %s, eliminarlo prima di provare a "
 "spostare il database esistente.<br>Errore: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "Impossibile spostare il database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "Nessuna informazione dettagliata disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 "Non ĆØ disponibile alcuna informazione dettagliata per i libri nel "
 "dispositivo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Errore di comunicazione col dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4024,13 +4370,13 @@ msgstr ""
 "Si ĆØ verificato un errore di comunicazione temporaneo col dispositivo. "
 "Disconnettere e riconnettere il dispositivo e/o riavviare"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Errore di conversione"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4039,11 +4385,11 @@ msgstr ""
 "href=\"%s\">DRM</a>. ƈ necessario rimuovere prima il DRM usando programmi di "
 "terze parti."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "Il database non esiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -4051,11 +4397,11 @@ msgstr ""
 "La cartella in cui il database dovrebbe essere: %s non esiste piĆ¹. Scegliere "
 "una nuova posizione per il database."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr "Selezionare una nuova posizione per il database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4063,11 +4409,11 @@ msgstr ""
 "ĆØ il risultato degli sforzi di tanti volontari da tutto il mondo. Se lo "
 "trovi utile, puoi fare una donazione per supportare il suo sviluppo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr "Ci sono lavori attivi. Uscire comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
@@ -4078,11 +4424,11 @@ msgstr ""
 "dispositivo.<br>\n"
 "                  'Uscire comunque?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr "ATTENZIONE: Lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4090,7 +4436,7 @@ msgstr ""
 "continuerĆ  a lavorare nel vassoio di sistema. Per chiuderlo, selezionare "
 "<b>Esci</b> nel menu contestuale del vassoio di sistema."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4098,7 +4444,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Ultima versione: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4108,39 +4454,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nuove "
 "funzionalitĆ </a>. Una visita alla pagina del download?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "Aggiornamento disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
-msgstr "Usa la libreria collocata nel percorso specificato."
+msgstr "Usa la biblioteca collocata nel percorso specificato."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr "Invia le informazioni di debug alla console"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr "Disabilita l'icona nel vassoio di sistema"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr "File in uscita:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "Ricerca avanzata"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Cerca:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4148,7 +4494,7 @@ msgstr ""
 "Cerca nella lista dei libri per titolo o autore<br><br>Parole separate da "
 "spazi hanno come operatore AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4156,75 +4502,99 @@ msgstr ""
 "Cerca nella lista dei libri per titolo, autore, editore, tag e "
 "commenti<br><br>Parole separate da spazi hanno come operatore AND"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Resetta ricerca veloce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr "Fai corrispondere uno qualsiasi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr "Fai corrispondere tutti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr "Ordina per p&opolaritĆ "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "Aggiungi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Rimuovi libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Canc"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Modifica metadati"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "Invia al dispositivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Scarica notizie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "Converti libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr "Apri la cartella contenente"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr "Visualizza i dettagli del libro"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr "Libri dello stesso autore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr "Libri in questa serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr "Libri di questo editore"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr "Libri con lo stesso tag"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -4237,23 +4607,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "ERRORE: eccezione non gestita"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Lavori:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Fare clic per vedere una lista dei lavori attivi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Fare clic per sfogliare i libri per copertine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Fare clic per disattivare la navigazione per copertina"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4261,7 +4631,7 @@ msgstr ""
 "<p>La navigazione per copertina ĆØ disabilitata.<br>Caricamento del modulo "
 "pictureflow fallito:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr "Fare clic per sfogliare i libri per tag"
 
@@ -4408,7 +4778,7 @@ msgid "The standard font type"
 msgstr "Il tipo di carattere predefinito"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr "Sommario"
 
@@ -4434,59 +4804,59 @@ msgstr ""
 msgid "Search for text in book"
 msgstr "Cerca del testo nel libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr "Scelta libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr "Libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr "Aggiungi segnalibro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr "Inserire il titolo per il segnalibro:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr "Nessuna corrispondenza trovata per %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr "Caricamento..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr "Impaginazione %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr "Caricamento libro..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Questo libro ĆØ protetto da <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr "Errore DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr "Impossibile aprire il libro"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr "Opzioni per controllare il visualizzatore di libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4496,50 +4866,54 @@ msgstr ""
 "\n"
 "Visualizza un libro.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr "Visualizzatore di libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr "Barra degli strumenti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr "Pagina successiva"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr "Pagina precedente"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr "Dimensione del font maggiore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr "Dimensione del font minore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr "Trova successivo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr "ModalitĆ  riferimento"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr "Segnalibro"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "Espressione regolare non valida"
@@ -4548,38 +4922,48 @@ msgstr "Espressione regolare non valida"
 msgid "Invalid regular expression: %s"
 msgstr "Espressione regolare non valida: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Biblioteca"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+"Biblioteca\n"
+"%d\n"
+"libri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Lettore\n"
-"%s disponibili"
+"%s\n"
+"disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Scheda\n"
-"%s disponibili"
+"%s\n"
+"disponibile"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 "Fare clic per vedere la lista di libri disponibili sul proprio computer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Fare clic per vedere la lista di libri nella memoria principale del proprio "
 "lettore"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Fare clic per vedere la lista di libri nella scheda di memoria del proprio "
@@ -4612,12 +4996,16 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr "Nome utente per l'accesso. Predefinito: %default"
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr "La dimensione massima per le copertine visualizzate"
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
 "settings."
 msgstr ""
-"Percorso alla libreria di calibre. L'impostazione predefinita ĆØ quella di "
+"Percorso alla biblioteca di calibre. L'impostazione predefinita ĆØ quella di "
 "usare il percorso salvato nelle impostazioni."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:172
@@ -4687,7 +5075,7 @@ msgid ""
 "folder."
 msgstr ""
 "Il prefisso per tutti i percorsi. L'impostazione predefinita ĆØ il percorso "
-"alla cartella della libreria."
+"alla cartella della biblioteca."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:193
 msgid ""
@@ -4919,30 +5307,30 @@ msgstr ""
 "\n"
 "Per aiuto su un comando particolare: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr "<p>Sto copiando i libri in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr "Sto copiando <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
-"<p>Sto migrando il vecchio database nella nuova libreria in %s<br><center>"
+"<p>Sto migrando il vecchio database nella nuova biblioteca in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr "Compattazione database"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
-"Password per accedere alla propria libreria di calibre. Il nome utente ĆØ "
+"Password per accedere alla propria biblioteca di calibre. Il nome utente ĆØ "
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
@@ -4952,53 +5340,61 @@ msgstr ""
 "\n"
 "Avvia il server dei contenuti di calibre."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "Impossibile avviare il gestore dei lavori."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr "Lavoro fermato dall'utente"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sUso%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Creato da "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr "Percorso del database in cui sono salvati i libri"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr "Modelli per indovinare i metadati dai nomi dei file"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr "Chiave di accesso per isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr "Timeout predefinito per le operazioni di rete (secondi)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
-msgstr "Percorso alla cartella in cui ĆØ salvata la libreria"
+msgstr "Percorso alla cartella in cui ĆØ salvata la biblioteca"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr "La lingua in cui visualizzare l'interfaccia utente"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Il formato predefinito per la conversione dei libri."
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr "Leggi metadati dai file"
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr "La prioritĆ  dei processi di lavoro"
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
-msgstr "Impossibile inizializzare la libreria fontconfig"
+msgstr "Impossibile inizializzare la biblioteca fontconfig"
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
 msgid "URL must have the scheme sftp"
@@ -5016,13 +5412,13 @@ msgstr "Negoziazione della sessione SSH fallita: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Autenticazione fallita col server: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Feed sconosciuto"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "Articolo senza titolo"
 
@@ -5036,7 +5432,7 @@ msgid "Customize the download engine"
 msgstr "Personalizza il motore degli scaricamenti"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -5045,7 +5441,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -5054,7 +5450,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -5063,7 +5459,7 @@ msgstr ""
 "L'impostazione predefinita ĆØ quella di provare a indovinare la codifica"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -5075,7 +5471,7 @@ msgstr ""
 "impostazione predefinita i link non vengono seguiti"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -5091,7 +5487,7 @@ msgstr ""
 "prima"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "Non scaricare i fogli di stile CSS"
 
@@ -5224,69 +5620,69 @@ msgid "Dont show the progress bar"
 msgstr "Non mostrare la barra di progresso"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "Scaricamento feed..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Sorgente di notizie sconosciuta"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Scaricamento completato"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " da "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Scaricamento dei seguenti articoli fallito parzialmente:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tLink falliti:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 "Impossibile scaricare l'articolo. Eseguire con --debug per vedere la ragione"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "Ricevuti feed dalla pagina principale"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "Tentativo di scaricamento della copertina..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Inizio scaricamento [%d articolo(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feed scaricati in %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "Impossibile scaricare la copertina: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "Scaricamento copertina da %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "Articolo senza titolo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -5296,23 +5692,23 @@ msgstr ""
 "Scaricato articolo %s da %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "Articolo scaricato: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "Scaricamento fallito dell'articolo: %s da %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Scaricamento fallito dell'articolo: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "Scaricamento feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -5322,11 +5718,11 @@ msgstr ""
 "\n"
 "Dov'ĆØ l'URL. Esempio: http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Cartella base in cui le URL sono salvate. Predefinita: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -5334,7 +5730,7 @@ msgstr ""
 "Numero massimo di livelli ricorsivi, cioĆØ profonditĆ  dei link da seguire. "
 "Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5342,10 +5738,13 @@ msgstr ""
 "Il numero massimo di file da scaricare. Questa si applica solo ai file dai "
 "tag <a fref>. Predefinito: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Mostra un output dettagliato. Utile per il debugging"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "Pri&oritĆ  per i lavori di conversione:"
+
 #~ msgid "Author"
 #~ msgstr "Autore"
 
@@ -5399,6 +5798,20 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ msgid "Double click to <b>edit</b> me<br><br>"
 #~ msgstr "Doppio clic per <b>modificarmi</b><br><br>"
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "Aggiungi libri ricorsivamente (un libro per cartella, assume che ogni file "
+#~ "sia lo stesso libro in un diverso formato)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "Aggiungi libri ricorsivamente (piĆ¹ libri per cartella, assume che ogni file "
+#~ "sia un libro diverso)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Notizie scaricate. Salvataggio sul dispositivo"
 
@@ -5413,6 +5826,46 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ msgid "Custom news sources"
 #~ msgstr "Fonti di notizie personalizzate"
 
+#~ msgid "Library"
+#~ msgstr "Biblioteca"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Lettore\n"
+#~ "%s disponibili"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Scheda\n"
+#~ "%s disponibili"
+
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+
 #~ msgid ""
 #~ "The fields to display when listing books in the database. Should be a comma "
 #~ "separated list of fields.\n"
@@ -5424,12 +5877,55 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 #~ "Campi disponibili: %s\n"
 #~ "Predefinito: %%default"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "&Chiedere conferma prima di eliminare i file"
+
+#~ msgid "Confirm delete"
+#~ msgstr "Conferma elininazione"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Si ĆØ sicuri di voler eliminare questi %d libri?"
+
 #~ msgid "Cannot kill waiting job"
 #~ msgstr "Impossibile uccidere il lavoro in attesa"
 
 #~ msgid "Using library at"
 #~ msgstr "Sto usando la libreria in"
 
+#~ msgid ""
+#~ "If fewer than this number of chapters is detected, then links are added to "
+#~ "the Table of Contents."
+#~ msgstr ""
+#~ "Se viene rilevato un numero di capitoli inferiore a questo numero, i link "
+#~ "verranno aggiunti al sommario."
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [opzioni] nome_file\n"
+#~ "\n"
+#~ "Converte uno qualsiasi di una vasta gamma di formati di libri in un file "
+#~ "epub. Formati supportati: %s\n"
+
+#~ msgid "LRF"
+#~ msgstr "LRF"
+
+#~ msgid "EPUB"
+#~ msgstr "EPUB"
+
+#~ msgid "&Output format:"
+#~ msgstr "&Formato in uscita:"
+
+#~ msgid ""
+#~ "If you disable this setting, metadatas is guessed from the filename instead. "
+#~ "This can be configured in the Advanced section."
+#~ msgstr ""
+#~ "Se si disabilita questa impostazione, i metadati saranno indovinati dal nome "
+#~ "del file. Questa impostazione puĆ² essere configurata nella sezione Avanzata."
+
 #~ msgid ""
 #~ "The fields to display when listing books in the database. Should be a comma "
 #~ "separated list of fields.\n"
@@ -5445,3 +5941,6 @@ msgstr "Mostra un output dettagliato. Utile per il debugging"
 
 #~ msgid "Detailed logging"
 #~ msgstr "registro dettagliato"
+
+#~ msgid "Disable system tray icon"
+#~ msgstr "Disabilita l'icona nel vassoio di sistema"
diff --git a/src/calibre/translations/nb.po b/src/calibre/translations/nb.po
index 260c77d3ad..b2a4e7164d 100644
--- a/src/calibre/translations/nb.po
+++ b/src/calibre/translations/nb.po
@@ -7,32 +7,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-25 23:05+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-05 23:40+0000\n"
 "Last-Translator: Helene Klungvik <Unknown>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Finner ikke %s lagringsenheten. Venligst prĆøv Ć„ restarte."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Lesebrettet har ikke et lagringskort tilknyttet seg."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Opsjoner for Ć„ kontrollere konverteringen til EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -40,7 +214,7 @@ msgstr ""
 "UtgƄende EPUB fil. Hvis dette ikke er spesifisert, sƄ blir navnet avledet "
 "fra inngƄende filnavn."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -50,7 +224,7 @@ msgstr ""
 "uavhenging EPUB. Profilen er brukt for spesifikke enhetsrestriksjoner pƄ "
 "EPUB. Valgmulighetene er: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
@@ -58,11 +232,11 @@ msgstr ""
 "Filstien til et CSS stilark eller rƄkodet CSS. CSS vil tilsidesette enhver "
 "eksisterende CSS deklarasjoner i kildefilene."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Kontrollerer auto detektering av dokument strukturen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -86,25 +260,30 @@ msgstr ""
 "videre hjelp \n"
 "i bruken av denne muligheten.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
 "chapters. A value of \"none\" will disable chapter marking and a value of "
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
+"Spesifiser hvordan Ć„ markere detekterte kapitler. Verdien \"pagebreak\" vil "
+"sette inn sideavslutning fĆør kapitler. Verdien \"rule\" vil sette inn en "
+"linje fĆør kapitler. Verdien \"none\" vil ikke medfĆøre kapittel markering og "
+"verdien \"both\" vil bruke bƄde sideavslutning og linjer for Ƅ markere "
+"kapitler."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr "Filstien til omslagsbilde for boken"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr "Bruk omslagsbilde fra kildefilen fremfor spesifisert omslagsbilde."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -117,7 +296,7 @@ msgstr ""
 "og den inneholder et innholdsregister, sƄ vil denne bli brukt fremfor Ƅ \n"
 "autogenerere et innholdsregister.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
@@ -127,19 +306,17 @@ msgstr ""
 "funksjonen. Standard er: %default. Lenker blir bare lagt til "
 "innholdsregisteret hvis mindre enn --toc-threshold kapitler blir oppdaget."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Ikke legg til automatisk oppdagede kapitler til innholdsregisteret."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
-"Hvis mindre enn angitt antall kapitler blir oppdaget, legges lenkene til "
-"innholdsregisteret."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
@@ -149,7 +326,7 @@ msgstr ""
 "innholdsregisteret pĆ„ fĆørste nivĆ„. NĆ„r dette er spesifisert, sĆ„ vil det ha "
 "hĆøyere prioritet enn andre former for automatisk detektering."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
@@ -158,142 +335,96 @@ msgstr ""
 "XPath uttrykket angir at alle tagger burde bli lagt til nivƄ to av "
 "innholdsregisteret. Hvert innlegg blir lagt til under forrige nivƄ en."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
 "placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
 "an overview of the NCX format."
 msgstr ""
+"Filstien til en .ncx fil som inneholder innholdsregisteret for denne eboken. "
+"NCK filen burde inneholde lenker som er relative til katalogen den er "
+"plassert i. Se http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"en oversikt over NCX formatet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
+"Bruk alltid automatisk oppdaget innholdsregister, fremfor innholdsregisteret "
+"i kildefilen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
-msgstr ""
+msgstr "Kontroller side oppsettet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
-msgstr ""
+msgstr "Angi toppmargen i pts. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
-msgstr ""
+msgstr "Angi bunnmargen i pts. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
-msgstr ""
+msgstr "Angi venstremargin i pts. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
-msgstr ""
+msgstr "Angi hĆøyremargin i pts. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -304,8 +435,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -318,93 +454,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -417,30 +553,43 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
 msgstr "%applikasjon [opsjoner] LITFIL"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Lagringskatalog. Standard er nƄvƦrende katalog"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
 "Uthentet markup fra lesbart format. Dette kan medfĆøre at mellomrom, "
 "tabulatorer og linjeskift blir modifisert."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Praktisk for feilsĆøking."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB bok opprettet i"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Angi tittel. Standard: filnavn"
@@ -470,7 +619,7 @@ msgstr "SorteringsnĆøkkel for forfatter"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Forlag"
 
@@ -770,11 +919,11 @@ msgstr ""
 "for Windows maskiner er cp-1252. utf-8 er ogsƄ et vanlig valg. Vanlig "
 "forsĆøks vinkel er Ć„ gjette tegnkoden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -791,78 +940,78 @@ msgstr ""
 "eller ZIP arkiv ved Ć„ sĆøke etter ebĆøker inni arkivet.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Ingen fil angitt for konvertering"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "Gjengitt %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Opsjoner for Ć„ kontrollere konverteringen av tegneserier (CBR, CBZ) filer "
 "til digitale bĆøker."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr "Tittel for generert digitalbok. Standard er Ć„ bruke filnavnet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Angi forfatter i metadataene til generert digitalbok. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Antall farger brukt for grƄskala bildekonvertering. Standard er %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Forhindre normalisering (forbedre kontrasten) av farge rangering for bilder. "
 "Standard: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr "Beholde bilde sideforhold. Standard er Ć„ fylle hele skjermen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "Ikke foreta skjerping av bilder"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Ikke splitt landskapsbilder i to portrett bilder"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -871,13 +1020,13 @@ msgstr ""
 "landskapssider blir splittet til portrettbilder som leses fra hĆøyre til "
 "venstre."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -885,14 +1034,14 @@ msgstr ""
 "Ikke sorter filene i tegneserien alfabetisk etter navn. Bruk rekkefĆølgen "
 "filene ble lagt til i tegneserien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -900,22 +1049,22 @@ msgstr ""
 "Informativ modus, nyttig for feilretting. Kan bli spesifisert flere ganger "
 "for Ć„ motta ytterligere informasjon."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Ikke vis fremskrittssĆøyle."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Utdata blir skrevet til"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Prosesserer tegneserie sider..."
 
@@ -965,56 +1114,56 @@ msgstr "Opsjoner for Ć„ kontrollere oppfĆørselen til html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr "Innehenting av oppskrift feilet: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer fil oppdaget."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tProsesserer HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen fil oppdaget. Analyserer pƄ nytt..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "Skrevet fĆørbehandlet HTML til "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Behandler %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tKonverterer til BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Kunne ikke analysere fil: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s er en innholdslĆøs fil"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Analysering av lenken feilet %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Kan ikke legge til lenken %s i innholdsregisteret"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Kunne ikke behandle bilde %s. Feilmelding: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Behandlingen av linjeflettet PNG feilet %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1022,14 +1171,14 @@ msgstr ""
 "Behandlingen av bildet feilet: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "Under behandlingen av en tabell inntraff det en feil: %s. Ignorer tabell "
 "markup."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1037,29 +1186,29 @@ msgstr ""
 "DĆ„rlig tabell:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "Tabellen har en celle som er for stor"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr "Nettstedet %s mĆ„ lagres som en html fil fĆør man kjĆører html2lrf."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Kunne ikke lese omslagsbilde: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Kan ikke lese fra: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Behandlingen av opf filen feilet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1286,17 +1435,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1315,25 +1464,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1342,23 +1491,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1437,7 +1586,7 @@ msgstr "BruksmƄte: %s fil.lit"
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1449,11 +1598,11 @@ msgstr "BruksmƄte: pdf-meta fil.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1462,7 +1611,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1530,6 +1679,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1565,9 +1726,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1575,8 +1736,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1590,6 +1751,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1665,83 +1827,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1757,189 +1980,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1948,6 +2184,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1965,7 +2239,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -2019,25 +2293,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -2047,7 +2321,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -2088,22 +2362,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2118,14 +2392,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2146,14 +2420,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2166,7 +2440,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2175,7 +2449,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2184,8 +2458,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2598,91 +2872,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2744,93 +3022,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2980,25 +3277,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -3010,7 +3307,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3240,52 +3537,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3314,7 +3621,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3339,12 +3646,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3353,7 +3660,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3361,144 +3668,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3514,383 +3829,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3901,29 +4281,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -4066,7 +4446,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4090,109 +4470,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4201,31 +4585,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4253,6 +4642,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4480,79 +4873,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sBruksomrƄde%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Utviklet av "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4572,13 +4973,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4591,28 +4992,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4620,7 +5021,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4630,7 +5031,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4727,114 +5128,114 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
diff --git a/src/calibre/translations/nds.po b/src/calibre/translations/nds.po
index 47c1c70a0c..505e0c0c06 100644
--- a/src/calibre/translations/nds.po
+++ b/src/calibre/translations/nds.po
@@ -7,33 +7,220 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-26 23:34+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2009-01-04 01:54+0000\n"
 "Last-Translator: S. Dorscht <Unknown>\n"
 "Language-Team: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Macht gar nix"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Basis"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Datei Typ"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Metadaten Reader"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Metadaten Writer"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"Folge alle lokalen Verweise in einer HTML Datei und erstelle eine ZIP Datei "
+"mit allen verlinkten Dateien. Dieses Plugin lƤuft immer, wenn sie eine HTML "
+"Datei zur Bibliothek hinzufĆ¼gen."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Metadaten aus %s Dateien lesen"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr "Cover aus Comic Dateien extrahieren"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr "Metadaten in EPUB Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr "Metadaten in LRF Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr "Metadaten in RTF Dateien angeben"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "Installierte Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr "Mapping fĆ¼r Dateityp Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr "Lokale Plugin Anpassung"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Ausgeschaltene Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr "Kein gĆ¼ltiges Plugin gefunden in "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr "Staren des Plugins %s schlug fehl. Traceback:"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+"    %prog options\n"
+"    \n"
+"    Calibre anpassen durch das Laden externer Plugins.\n"
+"    "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+"Plugin hinzufĆ¼gen durch die Angabe des Pfads zur ZIP Datei, die das Plugin "
+"enthƤlt."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+"Anpassbares Plugin entfernen. Dies hat keinen Einfluss auf festinstallierte "
+"Plugins"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+"Plugin anpassen. Geben Sie den Namen des Pugins und die Anpassung durch ein "
+"Komma getrennt an."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr "Installierte Plugins auflisten"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr "GewƤhltes Plugin einschalten"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr "GewƤhltes Plugin ausschalten"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Konnte das Laufwerk %s nicht finden. Versuchen Sie einen Neustart."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Im Reader ist keine Speicherkarte eingesteckt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Einstellungen zur Kontrolle der Konvertierung zu EPUB Dateien"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -41,7 +228,7 @@ msgstr ""
 "EPUB Ausgabedatei. Falls nicht angegeben, wird es vom ursprĆ¼nglichen "
 "Dateinamen abgeleitet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
@@ -52,7 +239,7 @@ msgstr ""
 "gerƤtespezifische EinschrƤnkungen der EPUB Datei verwendet. Es gibt folgende "
 "Wahlmƶglichkeiten: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
@@ -60,11 +247,11 @@ msgstr ""
 "Entweder der Pfad zu einem CSS Stylesheet oder original CSS. Dieses CSS "
 "Ć¼berschreibt alle existierenden CSS Angaben in den Ursprungsdateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Kontrolle der automatischen Erkennung der Dokumentstruktur."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -88,7 +275,7 @@ msgstr ""
 "dieses Features gibt es im\n"
 "XPath Tutorial im calibre User Manual.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -101,11 +288,11 @@ msgstr ""
 "Kapitelmarkierung aus und der Wert \"both\" verwendet sowohl SeitenumbrĆ¼che "
 "als auch Linien zur Kapitelmarkierung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr "Pfad zum Umschlagbild, das fĆ¼r dieses Buch verwendet werden soll"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
@@ -113,7 +300,7 @@ msgstr ""
 "Verwendet bevorzugt das aus der Ursprungsdatei gewonnene Umschlagbild "
 "anstatt des angegebenen Umschlagbildes."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -127,7 +314,7 @@ msgstr ""
 "versuchen\n"
 "ein Inhaltsverzeichnis automatisch zu erstellen.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
@@ -138,19 +325,19 @@ msgstr ""
 "VerknĆ¼pfungen werden nur dann zum Inhaltsverzeichnis hinzugefĆ¼gt, wenn "
 "weniger Kapitel als in --toc-threshold angegeben erkannt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Automatisch erkannte Kapitel nicht zum Inhaltsverzeichnis hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
-"Falls weniger Kapitel erkannt werden als in dieser Zahl angegeben, dann "
-"werden VerknĆ¼pfungen zum Inhaltsverzeichnis hinzugefĆ¼gt."
+"Wurden weniger Kapitel als hier angegeben erkannt, werden VerknĆ¼pfungen zum "
+"Inhaltsverzeichnis hinzugefĆ¼gt. Voreinstellung: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
@@ -160,7 +347,7 @@ msgstr ""
 "Ebene 1 hinzugefĆ¼gt werden sollen. Falls dies angegeben wird, erhƤlt es "
 "PrioritƤt Ć¼ber andere Formen der automatischen Erkennung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
@@ -170,7 +357,7 @@ msgstr ""
 "Ebene 2 hinzugefĆ¼gt werden sollen. Jeder Eintrag wird unter dem vorherigen "
 "Ebene 1 Eintrag angelegt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -183,7 +370,7 @@ msgstr ""
 "NCX Format erhalten Sie unter http://www.niso.org/workrooms/daisy/Z39-86-"
 "2005.html#NCX."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
@@ -193,31 +380,31 @@ msgstr ""
 "enthƤlt, dieses anstelle des automatisch erkannten verwendet. Mit dieser "
 "Option wird immer das automatisch erkannte Inhaltsverzeichnis verwendet."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr "Einstellungen des Seitenlayouts"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 "Oberen Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 "Unteren Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 "Linken Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 "Rechten Rand der Seite in Punkt eingeben. Die Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
@@ -225,7 +412,7 @@ msgstr ""
 "Die BezugsschriftgrĆ¶ĆŸe in Punkt. Die Voreinstellung ist %defaultpt. Geben "
 "Sie 0 an, um die GrĆ¶ĆŸenƤnderung von Schriften auszuschalten."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
@@ -233,7 +420,7 @@ msgstr ""
 "Abstand zwischen Paragrafen entfernen. Funktioniert nicht, falls die "
 "Ursprungsdatei AbstƤnde zwischen Paragrafen erzwingt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
@@ -244,94 +431,42 @@ msgstr ""
 "verwenden. Diese Option verlangsamt extrem die Verarbeitung von groƟen HTML "
 "Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr "Erstellte OPF Datei nach stdout ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr "Erstellte NCX Datei nach stdout ausgeben"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr "Zwischendateien wƤhrend des Verarbeitens mit html2epub beibehalten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 "Den Inhalt der erstellten EPUB Datei in das angegebene Verzeichnis "
 "extrahieren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
-"%%prog [options] Dateiname\n"
+"%%prog [options] filename\n"
 "\n"
-"Konvertiert eine groƟe Anzahl von eBook Formaten in eine EPUB Datei. "
-"UnterstĆ¼tzte Formate: %s\n"
+"Konvertiert verschiedenste eBook Formate in eine %s Datei. UnterstĆ¼tzte "
+"Formate: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr "Konnte kein eBook im Archiv finden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -349,8 +484,13 @@ msgstr ""
 "VerknĆ¼pfungen aus dem\n"
 "<spine> Element der OPF Datei verwendet.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr "Ausgabe geschrieben nach "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "Geben Sie eine Eingabedatei im HTML Format an."
 
@@ -365,7 +505,7 @@ msgstr ""
 "Konnte keinen vernĆ¼nftige Stelle zur Trennung finden: %s UnterbaumgrĆ¶ĆŸe: %d "
 "KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
@@ -373,25 +513,25 @@ msgstr ""
 "\t\tZu viel Textauszeichnung. Wieder-Aufteilung ohne Bewahrung der Struktur. "
 "Dies kann zu falschem Rendering fĆ¼hren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "Verarbeitetes HTML wurde geschrieben in "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Einstellungen zur Kontrolle der Durchforstung von HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist das aktuelle Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Zeichenkodierung fĆ¼r HTML Dateien. Die Voreinstellung ist automatisches "
 "Erkennen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -399,11 +539,11 @@ msgstr ""
 "Erstellt die Ausgabe in eine ZIP Datei. Wird diese Option angegeben, sollte -"
 "-output der Name einer Datei und nicht eines Verzeichnisses sein."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Kontrolliert die Verfolgung von VerknĆ¼pfungen in HTML Dateien."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -411,7 +551,7 @@ msgstr ""
 "Durchforstet VerknĆ¼pfungen in HTML Dateien zuerst in die Breite. "
 "Normalerweise werden sie zuerst in die Tiefe durchforstet"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -420,39 +560,39 @@ msgstr ""
 "Dateien. Darf nicht negativ sein. 0 gibt an, dass keine VerknĆ¼pfungen in der "
 "ursprĆ¼nglichen HTML Datei verfolgt werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Geben Sie die Metadaten des erstellten eBooks an"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Geben Sie den Titel an. Voreinstellung ist automatische Ermittlung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "Autor(en) des eBooks, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr "Das Thema dieses Buches, als durch Kommata getrennte Liste."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr "Geben Sie den Herausgeber dieses Buches an."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr "InhaltsĆ¼bersicht dieses Buches."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr "Metadaten aus der angegebenen OPF Datei laden"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Hilfreiche Einstellungen zur Fehlersuche"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -460,13 +600,13 @@ msgstr ""
 "Noch ausfĆ¼hrlicher bei der weiteren Verarbeitung vorgehen. Kann zur "
 "VergrĆ¶ĆŸerung der AusfĆ¼hrlichkeit mehrfach angegeben werden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Ausgabe HTML ist \"hĆ¼bsch gedruckt\" zur einfacheren Analyse durch "
 "menschliche Wesen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -488,30 +628,43 @@ msgstr ""
 "in ihrem <spine> Element\n"
 "verwendet.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr "Erstelle LIT Datei aus EPUB..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
 msgstr "%prog [options] LITFILE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Ausgabeverzeichnis. Voreinstellung ist aktuelles Verzeichnis."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
 "Lesbares Format der extrahierten Textauszeichnung. Kƶnnte sinnvolle "
 "FreirƤume abƤndern."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Hilfreich bei der Fehlersuche."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB eBook erstellt in"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr "%prog [options] OPFFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr "Ausgabedatei. Voreinstellung stammt aus dem Namen der Eingabedatei."
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Geben Sie den Titel an. Voreinstellung: Dateiname."
@@ -543,7 +696,7 @@ msgstr "Sortierung nach Autor"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Herausgeber"
 
@@ -863,11 +1016,11 @@ msgstr ""
 "cp-1252. Eine andere gebrƤuchliche Alternative ist utf-8. In der "
 "Voreinstellung wird versucht, die Kodierung zu erraten."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr "Konvertierung von %s nach LRF wird nicht unterstĆ¼tzt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -886,19 +1039,19 @@ msgstr ""
 "ZIP Archive, indem es nach einem eBook im Archiv sucht.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Keine Datei zur Konvertierung angegeben."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "%s gerendert."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "%s schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
@@ -908,60 +1061,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Einstellungen zur Kontrolle der Konvertierung von Comic (CBR, CBZ) Dateien "
 "zu eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 "Titel fĆ¼r erstelltes eBook. In der Voreinstellung wird der Dateiname benutzt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Gibt den Autor in den Metadaten des erstellen eBooks an. Voreinstellung ist "
 "%default."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 "Pfad zur Ausgabedatei. Die Datei wird im aktuellen Verzeichnis erstellt "
 "(Voreinstellung)."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Anzahl der Farben fĆ¼r die Konvertierung von Graustufenbildern. "
 "Voreinstellung: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Deaktivieren der Normalisierung (verbessert den Kontrast) des Farbbereichs "
 "fĆ¼r Bilder. Voreinstellung: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "SeitenverhƤltnis des Bildes beibehalten. Voreinstellung ist "
 "bildschirmfĆ¼llende Darstellung."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "SchƤrfen deaktivieren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Bilder im Querformat nicht in zwei Bilder im Hochformat aufteilen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -969,7 +1122,7 @@ msgstr ""
 "SeitenverhƤltnis beibehalten und Bild so skalieren, dass die Bildschirmhƶhe "
 "als Bildbreite in der Querformatansicht verwendet wird."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -977,7 +1130,7 @@ msgstr ""
 "Benutzt fĆ¼r rechts-nach-links Publikationen wie Mangas. Querformatige Seiten "
 "werden von rechts nach links in mehrere hochformatige Seiten unterteilt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -985,7 +1138,7 @@ msgstr ""
 "Entkƶrnung einschalten. Reduziert die Kƶrnigkeit. Kann die Bearbeitungszeit "
 "stark verlƤngern."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -994,7 +1147,7 @@ msgstr ""
 "sortieren, sondern die Reihenfolge verwenden, in der sie zum Comic "
 "hinzugefĆ¼gt wurden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
@@ -1005,7 +1158,7 @@ msgstr ""
 "Diese Einstellung funktioniert fĆ¼r alle GerƤte mit derselben "
 "BildschirmgrĆ¶ĆŸe. Wahlmƶglichkeiten sind %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -1013,11 +1166,11 @@ msgstr ""
 "AusfĆ¼hrlicher, hilfreich zur Fehlersuche. Kann mehrmals angegeben werden um "
 "eine grĆ¶ĆŸere AusfĆ¼hrlichkeit zu erreichen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Fortschrittsbalken nicht anzeigen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
@@ -1027,11 +1180,11 @@ msgstr ""
 "\n"
 "Konvertiert ein Comic einer CBZ oder CBR Datei in ein eBook. \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Ausgabe gespeichert unter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Rendere Seiten des Comics..."
 
@@ -1080,56 +1233,56 @@ msgstr "Einstellungen fĆ¼r html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr "Abruf des Rezepts misslungen: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer Datei erkannt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tAnalysiere HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen Datei erkannt. Analysiere erneut..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "Vorverarbeitetes HTML gespeichert unter "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Verarbeite %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tKonvertiere in BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Konnte Datei nicht analysieren: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s ist eine leere Datei"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Fehlschlag bei der Analysierung von %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Konnte Link %s nicht zu TOC hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Konnte Bild %s nicht verarbeiten. Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Konnte verschachteltes PNG %s nicht verarbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1137,14 +1290,14 @@ msgstr ""
 "Konnte Bild nicht verarbeiten: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "Ein Fehler trat wƤhrend der Bearbeitung einer Tabelle auf: %s. "
 "Tabellenformat wird ignoriert."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1152,11 +1305,11 @@ msgstr ""
 "Schlechte Tabelle:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "Tabelle enthƤlt Zelle, die zu groƟ ist"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1164,19 +1317,19 @@ msgstr ""
 "Sichern Sie die Website %s zuerst als HTML Datei und benutzen Sie dann "
 "html2lrf mit der gespeicherten HTML Datei."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Konnte Umschlagbild nicht lesen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Lesen nicht mƶglich von: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Verarbeitung der OPF Datei schlug fehl"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1425,17 +1578,17 @@ msgstr "Gebe Kommentar ein"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Titel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Autor(en)"
 
@@ -1454,25 +1607,25 @@ msgstr "Kategorie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Bemerkung"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Etiketten"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Serie"
@@ -1481,25 +1634,25 @@ msgstr "Serie"
 msgid "Language"
 msgstr "Sprache"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 "Eine durch Kommata getrennte Liste von Etiketten, die angewendet werden "
 "sollen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr "Serie, zu der dieses eBook gehƶrt"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr "Serienindex"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr "Sprache des Buches"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr "Umschlagbild extrahieren"
 
@@ -1596,7 +1749,7 @@ msgstr "Benutzung: %s dateiname.lit"
 msgid "Cover saved to"
 msgstr "Umschlagbild gespeichert unter"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr "Geben Sie das Feld dc:language an"
 
@@ -1608,11 +1761,11 @@ msgstr "Benutzung: pdf-meta dateiname.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr "Benutzung: rb-meta file.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] dateiname.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "Original MOBI HTML gespeichert in"
 
@@ -1622,7 +1775,7 @@ msgstr ""
 "Das Ausgabeverzeichnis. Laut Voreinstellung das aktuelle Verzeichnis."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "HƤufig benutzte Verzeichnisse"
 
@@ -1695,6 +1848,18 @@ msgstr "Content Server automatisch beim Aufrufen von calibre starten"
 msgid "Oldest news kept in database"
 msgstr "Ƅlteste in der Datenbank gespeicherte Nachrichten"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "Symbol im Systembereich der Kontrollleiste anzeigen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "Geladene Nachrichten auf das GerƤt Ć¼bertragen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr "BĆ¼cher nach der Ɯbertragung auf das GerƤt aus der Bibliothek lƶschen"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "GerƤt ist nicht mehr verbunden."
@@ -1730,9 +1895,9 @@ msgstr "Buch auf dem GerƤt ansehen"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pfad"
 
@@ -1740,8 +1905,8 @@ msgstr "Pfad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formate"
@@ -1755,6 +1920,7 @@ msgstr "Dialog"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1831,19 +1997,27 @@ msgstr "Ent&kƶrnung"
 msgid "&Wide"
 msgstr "&Weite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
-msgstr "Allgemein"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr " Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr "Schnittstelle"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr "von"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "Allgemein"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Schnittstelle"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
@@ -1851,50 +2025,105 @@ msgstr ""
 "Content\n"
 "Server"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
-msgid "Error log:"
-msgstr "Fehler-Protokolldatei:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr "Plugins"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr "Kein gĆ¼ltiger Plugin Pfad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr "%s ist kein gĆ¼ltiger Plugin Pfad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr "Plugin wƤhlen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr "Plugin kann nicht ausgeschaltet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr "Das Plugin: %s kann nicht ausgeschaltet werden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr "Plugin nicht anpassbar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr "Plugin: %s bedarf keines Anpassens"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr "Anpassen von %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr "Kann festinstalliertes Plugin nicht entfernen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+" kann nicht entfernt werden, da es ein festinstalliertes Plugin ist. "
+"Versuchen Sie, es auszuschalten."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
+msgid "Error log:"
+msgstr "Fehler Log:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr "Zugriffs-Protokolldatei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr "Content Server konnte nicht gestartet werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "UngĆ¼ltige GrĆ¶ĆŸe"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+"Die GrĆ¶ĆŸe %s ist ungĆ¼ltig. Sie muss der Form BreitexHƶhe entsprechen."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Muss ein Verzeichnis sein."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Ortsangabe der Datenbank ungĆ¼ltig.<br>Speichern nicht mƶglich "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Komprimiere Datenbank. Das kann etwas dauern..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Komprimiere Datenbank..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1903,16 +2132,17 @@ msgstr ""
 "sortiert gespeichert und die Metadaten werden in der Datei metadata.db "
 "gespeichert)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Zu einem neuen Ort der Datenbank wechseln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1928,45 +2158,37 @@ msgstr "Zu einem neuen Ort der Datenbank wechseln"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Benachrichtigung anzeigen, wenn &neue Version verfĆ¼gbar ist"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "Nach einer BestƤtigung vor dem Lƶschen von Dateien fragen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
-"Wenn sie diese Einstellung ausschalten, dann werden die Metadaten aus dem "
-"Dateinamen erraten. Die Konfiguration ist im Abschnitt \"Erweitert\" mƶglich."
+"Falls Sie diese Einstellung ausschalten, werden die Metadaten aus dem "
+"Dateinamen erschlossen. Dies kann unter Erweitert konfiguriert werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr "&Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "Format zur &Speicherung einer Datei:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&PrioritƤt der KonvertierungsauftrƤge:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "Voreinstellung fĆ¼r Zei&tĆ¼berschreitung bei Netzwerkverbindungen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -1974,96 +2196,108 @@ msgstr ""
 "Voreinstellung der ZeitĆ¼berschreitung fĆ¼r Netzwerkabrufe festsetzen (Gilt "
 "immer dann, wenn aus dem Internet Informationen abgerufen werden sollen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " Sekunden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr "Sprache wƤh&len (erfordert Neustart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
-msgstr "Das voreingestellte Ausgabeformat fĆ¼r eBook Konvertierungen."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "Normal"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Hoch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "Niedrig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr "&Ausgabeformat:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "Auftrags&prioritƤt:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis zur Liste der hƤufig genutzten Verzeichnisse hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 "Ein Verzeichnis von der Liste der hƤufig genutzten Verzeichnisse entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "&Rƶmische Ziffern fĆ¼r Serien Nummerierung verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 "A&nzahl der Umschlagbilder, die (nach einem Neustart) in der Cover-Ansicht "
 "angezeigt werden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "GroƟ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Mittel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "&GrĆ¶ĆŸe der SchaltflƤchen in der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "Zeige &Text in SchaltflƤchen der Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "Si&chtbare Spalten in Bibliothek-Ansicht wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr "Den internen &Viewer fĆ¼r die folgenden Formate verwenden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+"Symbol im Sys&tembereich der Kontrollleiste aktivieren (erfordert Neustart)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "Geladene &Nachrichten automatisch an das GerƤt senden"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "Nachrichten nach dem Senden an das GerƤt aus der Bibliothek &lƶschen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Freier unbenutzter Festplattenspeicher der Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "Datenbank &komprimieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Meta-Daten aus dem Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
@@ -2073,23 +2307,23 @@ msgstr ""
 "von Ć¼berall aus mit Hilfe eines Browsers auf Ihre BĆ¼chersammlung zugreifen "
 "kƶnnen. EinstellungsƤnderungen erfolgen erst nach einem Neustart des Servers."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr "Server &Port:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "Ben&utzername:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
@@ -2097,33 +2331,45 @@ msgstr ""
 "Wenn Sie das Kennwort leer lassen, kann jeder auf Ihre BĆ¼chersammlung Ć¼ber "
 "das Webinterface zugreifen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "Pa&sswort anzeigen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+"Maximale GrĆ¶ĆŸe (BreitexHƶhe) der angezeigten Covers. GrĆ¶ĆŸere Covers werden "
+"verkleinert. "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr "Maximale &Cover-GrĆ¶ĆŸe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr "Server &starten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr "Server st&oppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr "Server &testen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr "Server &automatisch beim Starten hochfahren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr "Server Logs ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -2137,6 +2383,46 @@ msgstr ""
 "auf Ihrem iPhone hinzufĆ¼gen. In diesem Fall sollte meinservername der volle "
 "Hostname oder die IP Adresse dieses Rechners sein."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+"Hier kƶnnen Sie das Verhalten von Calibrie anpassen, indem sie festlegen, "
+"welche Plugins verwendet werden."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr "Plugin &ein-/ausschalten"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr "Plugin &anpassen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr "Plugin entfe&rnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr "Neues Plugin hinzufĆ¼gen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr "&Plugin Datei:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr "&HinzufĆ¼gen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr "Sicher?"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr "&Warnung erneut anzeigen"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "FEHLER"
@@ -2154,7 +2440,7 @@ msgstr "%s in EPUB konvertieren"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Meta-Daten"
 
@@ -2215,25 +2501,25 @@ msgstr "WƤhlen Sie das Umschlagbild fĆ¼r "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Lesen nicht mƶglich"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Sie haben nicht die nƶtigen Rechte, um diese Datei zu lesen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Fehler beim Lesen der Datei"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Es trat ein Fehler beim Lesen dieser Datei auf: <br /><b>"
 
@@ -2243,7 +2529,7 @@ msgid " is not a valid picture"
 msgstr " ist kein gĆ¼ltiges Bild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Konvertierung nicht mƶglich"
 
@@ -2286,22 +2572,22 @@ msgid "Book Cover"
 msgstr "Umschlagbild"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Um&schlagbild der Quelldatei verwenden"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "&Umschlagbild Ƥndern:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Nach Umschlagbild durchsuchen..."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Um&schlagbild der Quelldatei verwenden"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2316,14 +2602,14 @@ msgstr "Titel dieses Buches Ƥndern"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Autor(en): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2349,14 +2635,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Herausgeber: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Herausgeber dieses Buches Ƥndern"
@@ -2369,7 +2655,7 @@ msgstr "&Etiketten: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2381,7 +2667,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Serien:"
@@ -2390,8 +2676,8 @@ msgstr "&Serien:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2841,8 +3127,8 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
 "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -2852,24 +3138,24 @@ msgstr ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Meta-Informationen bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta-Informationen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "S&ortierung nach Autor: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2878,49 +3164,53 @@ msgstr ""
 "Geben Sie an, wie der Autor dieses Buches sortiert werden soll. \"Charles "
 "Dickens\" zum Beispiel als \"Dickens, Charles\"."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Bewertung:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Bewertung dieses Buches: 0-5 Sterne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " Sterne"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "&Etiketten hinzufĆ¼gen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Etiketten-Editor ƶffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "Etiketten entfe&rnen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 "Durch Kommata getrennte Liste der Etiketten, die von den BĆ¼chern entfernt "
 "werden. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr "&Format entfernen:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr "Automatisch Sortierung nach Autor setzen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2930,19 +3220,19 @@ msgstr ""
 "<b>LibraryThing.com</b> an. <br/>Insofern Sie dies nicht besitzen, kƶnnen "
 "Sie sich kostenlos <a href='http://www.librarything.com'>anmelden</a>! </p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Konnte kein Umschlagbild abrufen.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Konnte kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Kann kein Umschlagbild abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Sie mĆ¼ssen die ISBN fĆ¼r dieses Buch angeben."
 
@@ -3007,63 +3297,82 @@ msgstr "Passwort Ƥndern"
 msgid "Password needed"
 msgstr "Passwort erforderlich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr "Sie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr "Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr "%d Rezepte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr "Account-Informationen mĆ¼ssen angegeben werden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr "Dieses Rezept erfordert einen Benutzernamen und ein Kennwort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr "Erstellt von: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr "Zuletzt geladen: vor %s Tagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr "Zuletzt geladen: niemals"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr "Zeitgesteuerter Nachrichten Download"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "Neue individuelle Nachrichtenquelle hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr "Nachrichten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Rezepte"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr "Zeitplanung des Downloads"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr "Titel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr "Beschreibung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr "Autor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr "Ge&planter Download jeden:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
@@ -3071,25 +3380,25 @@ msgstr ""
 "Intervall, nach dem dieses Rezept geladen werden soll. Der Wert 0 hat einen "
 "stĆ¼ndlich wiederkehrenden Download zur Folge."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " Tage"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr "&Account"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr "Damit der Zeitplan funktioniert, muss calibre gestartet bleiben."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr "&Jetzt laden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
@@ -3097,7 +3406,7 @@ msgstr ""
 "Geladene Nachrichten lƶschen, die Ƥlter als die angegebene Zahl von Tagen "
 "sind. Zum Ausschalten auf den Wert 0 setzen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr "Geladene Nachrichten lƶschen, die Ƥlter sind als "
 
@@ -3213,7 +3522,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:63
 msgid "No recipe selected"
-msgstr "Kein Rezept ausgewƤhlt"
+msgstr "Kein Rezept gewƤhlt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
 msgid "The attached file: %s is a recipe to download %s."
@@ -3260,25 +3569,25 @@ msgstr "Dieser Feed wurde schon zu diesem Rezept hinzugefĆ¼gt"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "UngĆ¼ltige Eingabe"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>Konnte Rezept nicht erstellen. Fehler:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Rezept ersetzen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 "Es gibt schon ein erstelltes Rezept mit dem Namen %s. Soll es ersetzt werden?"
@@ -3291,9 +3600,9 @@ msgstr "Rezept wƤhlen"
 msgid "Pick the recipe to customize"
 msgstr "Rezept zum Anpassen auswƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
-msgstr "Eine Rezept Datei auswƤhlen"
+msgstr "Eine Rezept Datei wƤhlen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:214
 msgid "Add custom news source"
@@ -3557,52 +3866,64 @@ msgstr "Abwarten und Tee trinken..."
 msgid "Working"
 msgstr "Bei der Arbeit..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "Kann Auftrag nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Kann AuftrƤge, die mit dem GerƤt kommunizieren, nicht abbrechen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr "Auftrag wird schon ausgefĆ¼hrt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "GrĆ¶ĆŸe (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Bewertung"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Keine"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Buch <font face=\"serif\">%s</font> von %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr "Das ist nicht gestattet"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+"Direktes HinzufĆ¼gen auf das GerƤt wird nicht unterstĆ¼tzt. FĆ¼gen Sie das Buch "
+"zuerst zur Bibliothek hinzu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Suche (Zur erweiterten Suche die SchaltflƤche links klicken)"
 
@@ -3631,7 +3952,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Keine Treffer</b> fĆ¼r die Suchworte <i>%s</i> gefunden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Keine Treffer gefunden"
 
@@ -3656,12 +3977,12 @@ msgid "Previous Page"
 msgstr "Vorherige Seite"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "ZurĆ¼ck"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Weiter"
 
@@ -3670,7 +3991,7 @@ msgid "Next match"
 msgstr "NƤchster Treffer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "eBook ƶffnen"
 
@@ -3678,23 +3999,27 @@ msgstr "eBook ƶffnen"
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Fehler bei der Kommunikation mit dem GerƤt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr "&Spenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr "Be&enden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr "&Neustart"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3702,126 +4027,131 @@ msgstr ""
 "<p>Hilfe gibt es online bei <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s von <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "An Hauptspeicher senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "An Speicherkarte senden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr "und aus der Datenbank lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "Auf die Speicherkarte senden (Voreinstellung)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Meta-Daten einzeln bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Meta-Daten auf einmal bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "BĆ¼cher aus einem einzelnen Verzeichnis hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"BĆ¼cher rekursiv hinzufĆ¼gen (Ein Buch pro Verzeichnis, setzt voraus, dass "
-"jede eBook Datei das gleiche Buch in einem unterschiedlichen Format enthƤlt)"
+"BĆ¼cher aus Verzeichnissen hinzufĆ¼gen, inklusive Unterverzeichnissen (ein "
+"Buch pro Verzeichnis, jede eBook Datei im Verzeichnis ist dasselbe Buch in "
+"verschiedenen Formaten)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"BĆ¼cher rekursiv hinzufĆ¼gen (Mehrere BĆ¼cher pro Verzeichnis, setzt voraus, "
-"dass jede eBook Datei ein anderes Buch enthƤlt)"
+"BĆ¼cher aus Verzeichnissen hinzufĆ¼gen, inklusive Unterverzeichnissen "
+"(verschiedene BĆ¼cher im Verzeichnis, jede eBook Datei ist ein anderes Buch)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Auf Festplatte in ein einziges Verzeichnis speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Nur das %s Format auf Festplatte speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Vorschau"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Spezielles Format ansehen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Einzeln konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Auf einmal konvertieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr "Voreinstellung fĆ¼r Konvertierung eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr "Voreinstellungen fĆ¼r die Konvertierung von Comics eingeben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr "Ƅhnliche BĆ¼cher..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr "Schlechter Datenbank Standort"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr "WƤhlen Sie einen Speicherort fĆ¼r Ihre eBook Bibliothek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr "Migriere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "GerƤt: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " gefunden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Angeschlossen: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "GerƤtedatenbank ist beschƤdigt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3852,8 +4182,25 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr "Stop"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr "FĆ¼ge BĆ¼cher rekursiv hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr "HinzugefĆ¼gt "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr "Suche..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3861,100 +4208,121 @@ msgstr ""
 "<p>Es existieren bereits BĆ¼cher mit dem selben Titel in der Datenbank. "
 "Sollen die folgenden BĆ¼cher trotzdem hinzugefĆ¼gt werden?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Duplikate gefunden!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "Lade BĆ¼cher auf das GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr "BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr "EPUB BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr "LRF BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr "HTML BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr "LIT BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr "MOBI BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr "Text BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr "PDF BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr "Comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr "Archive"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr "Lese Metadaten..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr "FĆ¼ge BĆ¼cher hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr "Lese Metadaten von "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr "FĆ¼ge BĆ¼cher zur Datenbank hinzu..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "GerƤtespeicher voll"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Es kƶnnen keine BĆ¼cher mehr auf das GerƤt geladen werden, da der "
 "GerƤtespeicher voll ist "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
-msgstr "BestƤtigen Sie das Lƶschen"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+"Die gewƤhlten BĆ¼cher werden <b>dauerhaft gelƶscht</b> und die Dateien vom "
+"Computer entfernt. Sicher?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr "Sind Sie sicher, dass Sie diese %d BĆ¼cher lƶschen wollen?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "Lƶsche BĆ¼cher vom GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Kann Metadaten nicht bearbeiten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Keine BĆ¼cher ausgewƤhlt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr "Sende Nachrichten an das GerƤt."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "Sende BĆ¼cher an das GerƤt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "Keine geeigneten Formate"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3962,15 +4330,15 @@ msgstr ""
 "Die folgenden BĆ¼cher konnten nicht auf das GerƤt geladen werden, da keine "
 "geeigneten Formate vorhanden sind:<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Speichern auf Festplatte nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr "Zielverzeichnis auswƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3978,59 +4346,64 @@ msgstr ""
 "<p>Die folgenden BĆ¼cher konnten nicht auf die Festplatte gespeichert werden, "
 "da das %s Format fĆ¼r sie nicht verfĆ¼gbar ist:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Konnte einige eBooks nicht speichern"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "Rufe Nachrichten ab von "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr " abgerufen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Kein Buch ausgewƤhlt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Ansehen nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Format zur Vorschau wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr "Konnte Verzeichnis nicht ƶffnen"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s hat keine verfĆ¼gbaren Formate."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Konfiguration nicht mƶglich"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Konfiguration nicht mƶglich wƤhrend AuftrƤge abgearbeitet werden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr "Kopiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiere Bibliothek nach "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "UngĆ¼ltige Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -4038,23 +4411,24 @@ msgstr ""
 "<p>Es existiert bereits eine ungĆ¼ltige Datenbank in %s, bitte lƶschen Sie "
 "diese, bevor sie die bestehende Datenbank verschieben.<br>Fehler: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "Konnte Datenbank nicht verschieben"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "Es ist keine weitere Information verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
-msgstr "Es ist keine weitere Information Ć¼ber BĆ¼cher auf dem GerƤt verfĆ¼gbar"
+msgstr ""
+"Es sind keine weitere Informationen Ć¼ber BĆ¼cher auf dem GerƤt verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Fehler in der Kommunikation zum GerƤt"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -4062,13 +4436,13 @@ msgstr ""
 "Es trat ein Fehler in der Kommunikation mit dem GerƤt auf. Bitte entfernen "
 "und schlieƟen Sie das GerƤt wieder an und - oder starten Sie neu."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Konvertierungsfehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
@@ -4077,11 +4451,11 @@ msgstr ""
 "href=\"%s\">DRM</a> geschĆ¼tzt. Sie mĆ¼ssen zunƤchst das DRM mit einem anderen "
 "Programm entfernen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "Datenbank existiert nicht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -4089,11 +4463,11 @@ msgstr ""
 "Das Verzeichnis, in dem die Datenbank sein sollte: %s existiert nicht mehr. "
 "Bitte wƤhlen Sie einen neuen Ort fĆ¼r die Datenbank aus."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr "WƤhlen Sie einen neuen Speicherort fĆ¼r die Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
@@ -4102,12 +4476,12 @@ msgstr ""
 "Falls Sie es nĆ¼tzlich finden, sollten Sie eine Spende zur UnterstĆ¼tzung "
 "seiner Entwicklung in Betracht ziehen."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 "Es bestehen aktive AuftrƤge. Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
@@ -4117,11 +4491,11 @@ msgstr ""
 "                  'Ein Beenden kann das GerƤt beschƤdigen.<br>\n"
 "                  'Sind Sie sicher, dass sie es beenden wollen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr "WARNUNG: Aktive AuftrƤge"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
@@ -4129,7 +4503,7 @@ msgstr ""
 "wird im System Tray weiter laufen. Zum SchlieƟen wƤhlen Sie <b>Beenden</b> "
 "im KontextmenĆ¼ des System Tray."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -4137,7 +4511,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Letzte Version: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -4147,39 +4521,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">neuen Features</a> an. "
 "Mƶchten Sie die Download Seite besuchen?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "Neue Version verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr "Die im angegebenen Pfad sich befindende Bibliothek verwenden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr "Informationen zur Fehlersuche in Konsole aufzeichnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr "System Tray Icon ausschalten"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr "Ausgabe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "Erweiterte Suche"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Suche:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -4187,7 +4561,7 @@ msgstr ""
 "Liste der BĆ¼cher nach Titel oder Autor durchsuchen<br><br>Durch Leerzeichen "
 "getrennte Wƶrter werden mit \"UND\" verknĆ¼pft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -4196,75 +4570,99 @@ msgstr ""
 "durchsuchen<br><br>Durch Leerzeichen getrennte Wƶrter werden mit \"UND\" "
 "verknĆ¼pft"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Quick Search lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr "Ɯbereinstimmung mit irgendeinem"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr "Ɯbereinstimmung mit allen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr "Nach Beliebtheit sortieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "BĆ¼cher hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "BĆ¼cher entfernen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Lƶschen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Meta-Informationen editieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "An Reader Ć¼bertragen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Nachrichten abrufen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "In eBooks umwandeln"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr "Ɩffne enthaltenes Verzeichnis"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr "Zeige Buchdetails"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr "BĆ¼cher desselben Autors"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr "BĆ¼cher dieser Serie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr "BĆ¼cher dieses Herausgebers"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr "BĆ¼cher mit denselben Etiketten"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -4278,23 +4676,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "FEHLER: Unbehandelte Ausnahme"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "AuftrƤge:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Ein Klick zeigt die aktiven AuftrƤge."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Klicken Sie, um die BĆ¼cher in der Cover-Ansicht zu durchsuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Klicken Sie, um die Cover-Ansicht zu verlassen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4302,7 +4700,7 @@ msgstr ""
 "<p>Die Cover-Ansicht ist gesperrt.<br>Der Import des Pictureflow Moduls "
 "schlug fehl:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr "Klicken Sie, um die BĆ¼cher anhand von Etiketten zu durchsuchen"
 
@@ -4449,7 +4847,7 @@ msgid "The standard font type"
 msgstr "Standardschriftart"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
@@ -4475,59 +4873,59 @@ msgstr ""
 msgid "Search for text in book"
 msgstr "Suche nach Text im Buch"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr "eBook wƤhlen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr "eBooks"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr "Lesezeichen hinzufĆ¼gen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr "Titel fĆ¼r Lesezeichen eingeben:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr "Keine Treffer gefunden fĆ¼r: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr "Lade Ablauf..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr "Lege %s an"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr "Lade eBook..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr "<p>Dieses Buch ist geschĆ¼tzt durch <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr "DRM Fehler"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr "Konnte eBook nicht ƶffnen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr "Einstellungen zur Kontrolle des eBook Viewers"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
@@ -4537,50 +4935,54 @@ msgstr ""
 "\n"
 "eBook ansehen.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr "eBook Viewer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr "Symbolleiste"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr "NƤchste Seite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr "Vorherige Seite"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr "GrĆ¶ĆŸere Schrift"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr "Kleinere Schrift"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr "Weitersuchen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr "Voreinstellungen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr "Verweismodus"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr "Vollbildmodus beenden"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "UngĆ¼ltiger regulƤrer Ausdruck"
@@ -4589,36 +4991,46 @@ msgstr "UngĆ¼ltiger regulƤrer Ausdruck"
 msgid "Invalid regular expression: %s"
 msgstr "UngĆ¼ltiger regulƤrer Ausdruck: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Bibliothek"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+"Bibliothek\n"
+"%d\n"
+"BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Reader\n"
-"%s verfĆ¼gbar"
+"%s\n"
+"verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 "Karte\n"
-"%s verfĆ¼gbar"
+"%s\n"
+"verfĆ¼gbar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr "Ein Klick zeigt die Liste der auf dem Computer vorhandenen BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Ein Klick zeigt die Liste der im Hauptspeicher des GerƤts vorhandenen BĆ¼cher"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Ein Klick zeigt die Liste der auf der Speicherkarte des GerƤts vorhandenen "
@@ -4651,6 +5063,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr "Benutzername fĆ¼r den Zugriff. StandardmƤƟig ist es: %default"
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr "Maximale GrĆ¶ĆŸe fĆ¼r angezeigte Covers"
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4966,29 +5382,29 @@ msgstr ""
 "\n"
 "Sie erhalten Hilfe zu einem bestimmten Befehl mit: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr "<p>Kopiere BĆ¼cher nach %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr "Kopiere <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migriere alte Datenbank zu eBook Bibliothek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr "Komprimiere Datenbank"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 "Kennwort fĆ¼r den Zugriff auf die calibre Bibliothek. Benutzername ist "
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
@@ -4998,52 +5414,60 @@ msgstr ""
 "\n"
 "Startet den calibre Content-Server."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "Konnte Arbeitsprozess nicht starten."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr "Auftrag durch Benutzer unterbrochen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sBenutzung%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Erstellt von "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr "Pfad zur Datenbank in der die BĆ¼cher gespeichtert sind"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr "Verhaltensmuster zum Erraten der Metadaten aus den Dateinamen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr "ZugangsschlĆ¼ssel fĆ¼r isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 "Voreinstellung der ZeitĆ¼berschreitung bei Netzwerkverbindungen (in Sekunden)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr "Pfad zum Verzeichnis, in dem die Bibliothek gespeichert ist"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr "Sprache, in der die Benutzer-OberflƤche dargestellt wird"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Das voreingestellte Ausgabeformat fĆ¼r eBook Konvertierungen."
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr "Metadaten aus Dateien lesen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr "PrioritƤt der ArbeitsauftrƤge"
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr "Konnte die fontconfig library nicht initialisieren"
 
@@ -5063,13 +5487,13 @@ msgstr "Konnte SSH Sitzung nicht abschlieƟen: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authentifizierung schlug fehl am Server: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Feed unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "Artikel ohne Titel"
 
@@ -5084,7 +5508,7 @@ msgid "Customize the download engine"
 msgstr "Download-Engine anpassen"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -5093,7 +5517,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -5102,7 +5526,7 @@ msgstr ""
 "Voreinstellung ist %default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -5111,7 +5535,7 @@ msgstr ""
 "Voreinstellung wird versucht, die Kodierung zu erraten."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -5123,7 +5547,7 @@ msgstr ""
 "Links verfolgt."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -5138,7 +5562,7 @@ msgstr ""
 "sind, wird --filter-regexp zuerst angewendet."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "Lade CSS Stylesheets nicht herunter."
 
@@ -5270,70 +5694,70 @@ msgid "Dont show the progress bar"
 msgstr "Fortschrittsbalken nicht anzeigen"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "Rufe Feeds ab..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Nachrichtenquelle unbekannt"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Download beendet"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "Der Download der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " von "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Der Download von Teilen der folgenden Artikel schlug fehl:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tFehlgeschlagene VerknĆ¼pfungen:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 "Konnte Artikel nicht abrufen. Der erneute Start mit --debug zeigt mƶgliche "
 "GrĆ¼nde an"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "Feeds der Index Seite erhalten"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "Versuche Umschlagbild zu laden..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Starte Download von [%d Thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feeds wurden nach %s heruntergeladen"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "Konnte Umschlagbild nicht laden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "Lade Umschlagbild von %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "Artikel ohne Titel"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -5343,23 +5767,23 @@ msgstr ""
 "Artikel %s von %s geladen\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "Artikel geladen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "Laden der Artikel fehlgeschlagen: %s von %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Laden der Artikel schlug fehl: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "Rufe Feed ab"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -5369,13 +5793,13 @@ msgstr ""
 "\n"
 "URL ist z.B. http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "Grundverzeichnis, in das die URL gespeichert wird. Voreinstellung ist "
 "%default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -5383,7 +5807,7 @@ msgstr ""
 "Maximale Zahl von einbezogenen Ebenen, z.B. Tiefe der Links, die verfolgt "
 "werden. Voreinstellung %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5391,7 +5815,7 @@ msgstr ""
 "Hƶchstzahl der Dateien, die geladen werden. Dies trifft nur auf Dateien aus "
 "<a href> Tags zu. Voreinstellung ist %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 
@@ -5438,6 +5862,9 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "Speicherort der BĆ¼cherdatenbank (&library1.db)"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&PrioritƤt der KonvertierungsauftrƤge:"
+
 #~ msgid "&Access Key;"
 #~ msgstr "&ZugriffsschlĆ¼ssel:"
 
@@ -5510,6 +5937,20 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Ƅnderungen treten erst nach einem Neustart in Kraft."
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "BĆ¼cher rekursiv hinzufĆ¼gen (Ein Buch pro Verzeichnis, setzt voraus, dass "
+#~ "jede eBook Datei das gleiche Buch in einem unterschiedlichen Format enthƤlt)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "BĆ¼cher rekursiv hinzufĆ¼gen (Mehrere BĆ¼cher pro Verzeichnis, setzt voraus, "
+#~ "dass jede eBook Datei ein anderes Buch enthƤlt)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Nachrichten abgerufen. Ɯbertragung ans GerƤt lƤuft."
 
@@ -5524,6 +5965,23 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid "Custom news sources"
 #~ msgstr "Individuelle Nachrichtenquellen"
 
+#~ msgid "Library"
+#~ msgstr "Bibliothek"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Reader\n"
+#~ "%s verfĆ¼gbar"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Karte\n"
+#~ "%s verfĆ¼gbar"
+
 #~ msgid "Job killed by user"
 #~ msgstr "Auftrag durch Benutzer abgebrochen"
 
@@ -5540,6 +5998,29 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ msgid " does not allow copying of text."
 #~ msgstr " lƤsst das Kopieren von Text nicht zu."
 
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+
 #~ msgid ""
 #~ "Path to the calibre database. Default is to use the path stored in the "
 #~ "settings."
@@ -5704,6 +6185,15 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Die Voreinstellung ist der SONY PRS-500 mit einer BildschirmgrĆ¶ĆŸe von "
 #~ "584x754 Punkten. Wahlmƶglichkeiten sind %s"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Nach einer BestƤtigung vor dem Lƶschen von Dateien fragen"
+
+#~ msgid "Confirm delete"
+#~ msgstr "BestƤtigen Sie das Lƶschen"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Sind Sie sicher, dass Sie diese %d BĆ¼cher lƶschen wollen?"
+
 #~ msgid ""
 #~ "%prog [options] comic.cb[z|r]\n"
 #~ "\n"
@@ -5783,5 +6273,42 @@ msgstr "Zeige detailierte Ausgabeinformation. Hilfreich zur Fehlersuche."
 #~ "Sammelt zudem jegliche Hinweise und Quellen wie Bilder, Stylesheets, "
 #~ "Skripte, etc. \n"
 
+#~ msgid ""
+#~ "If fewer than this number of chapters is detected, then links are added to "
+#~ "the Table of Contents."
+#~ msgstr ""
+#~ "Falls weniger Kapitel erkannt werden als in dieser Zahl angegeben, dann "
+#~ "werden VerknĆ¼pfungen zum Inhaltsverzeichnis hinzugefĆ¼gt."
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [options] Dateiname\n"
+#~ "\n"
+#~ "Konvertiert eine groƟe Anzahl von eBook Formaten in eine EPUB Datei. "
+#~ "UnterstĆ¼tzte Formate: %s\n"
+
+#~ msgid "LRF"
+#~ msgstr "LRF"
+
+#~ msgid "EPUB"
+#~ msgstr "EPUB"
+
+#~ msgid "&Output format:"
+#~ msgstr "&Ausgabeformat:"
+
+#~ msgid ""
+#~ "If you disable this setting, metadatas is guessed from the filename instead. "
+#~ "This can be configured in the Advanced section."
+#~ msgstr ""
+#~ "Wenn sie diese Einstellung ausschalten, dann werden die Metadaten aus dem "
+#~ "Dateinamen erraten. Die Konfiguration ist im Abschnitt \"Erweitert\" mƶglich."
+
 #~ msgid "Detailed logging"
 #~ msgstr "AusfĆ¼hrliche Protokollierung"
+
+#~ msgid "Disable system tray icon"
+#~ msgstr "System Tray Icon ausschalten"
diff --git a/src/calibre/translations/nl.po b/src/calibre/translations/nl.po
index b5054cacdd..f1a007ae30 100644
--- a/src/calibre/translations/nl.po
+++ b/src/calibre/translations/nl.po
@@ -7,32 +7,206 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-09-04 01:49+0000\n"
 "Last-Translator: Marc van den Dikkenberg <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Schijf %s is niet gevonden. Probeer te herstarten."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Er is geen geheugen kaart verbonden met de reader."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Opties voor de conversie naar EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
@@ -40,24 +214,24 @@ msgstr ""
 "Het uitvoer EPUB bestand. Indien niet opgegeven, zal het worden gegenereerd "
 "uit de invoer naam."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Beinvloed auto-detectie van de document structuur."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -71,7 +245,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -79,17 +253,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -98,38 +272,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -137,134 +311,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -275,8 +397,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "Een bron HTML bestand is nodig"
 
@@ -289,29 +416,29 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "Schrijf verwerkte HTML naar "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Opties voor de verwerking van HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "De uitvoer folder. Standaard is de huidige folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr "Karakter codering voor HTML bestanden. Standaard is auto detect."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -319,11 +446,11 @@ msgstr ""
 "Genereer de uitvoer in een zip bestand. Als deze optie is gekozen, dan moet -"
 "-output de naam van een bestand zijn, niet de folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Configueer het volgen van links in HTML bestanden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -331,7 +458,7 @@ msgstr ""
 "Volg links in HTML bestanden in de breedte. Standaard worden ze eerst in de "
 "diepte gevolgd."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -340,39 +467,39 @@ msgstr ""
 "Deze waarde kan niet negatief zijn. Gebruik 0 aan te geven dan links in het "
 "top HTML bestand niet zullen worden gevolgd."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Metadata van het gegenereerde eboek"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Titel. Standaard is auto-detect."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "De auteur(s) van het eboek, als lijst gescheiden met komma's."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Opties handig voor debuggen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
@@ -380,12 +507,12 @@ msgstr ""
 "Geen meer informatie tijdens verwerking. Dit kan meerder malen worden "
 "opgegeven om meer informatie te verkrijgen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 "Uitvoer HTML is \"mooi geprint\" om makkelijker door mensen leesbaar te zijn"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -398,30 +525,43 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
 msgstr "%prog [opties] LITBESTAND"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Output folder. Standaard is dit de huidige folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
 "Formatteer de markup in leesbaar formaat. Zinvolle witruimte kan hierdoor "
 "gewijzigd worden."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Handig voor Debugging"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB boek bemaakt in"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "De titel. Standaard: bestandsnaam"
@@ -453,7 +593,7 @@ msgstr "Zoeksleutel voor de auteur"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Uitgeverij"
 
@@ -759,11 +899,11 @@ msgstr ""
 "gebruikte keuze is utf-8. Standaard zal er worden geprobeerd om de encoding "
 "automatisch te herkennen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -780,73 +920,73 @@ msgstr ""
 "bestanden, en zoekt ebook bestanden in deze archiven.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Geen bestand opgegeven om te converteren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "Gegenereerd %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "Mislukt %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 "Opties voor de configuratie van de conversie van comics (CBR, CBZ) bestanden "
 "naar eboek"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 "Titel voor gegenereerd eboek. Standaard word de bestandsnaam gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "De auteur in de metadata van het gegenereerde eboek. Standaard is %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 "Aantal kleuren voor beeld conversie naar grijstinten. Standaard: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Geen kleur normalisatie (contrast verbetering) voor afbeeldingen. Standaard: "
 "Nee (False)"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr "Behoudt afbeelding aspect ratio. Standaard is beeldvullend."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "Geen aanscherpen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Splits landscape afbeeldingen niet in twee portret afbeeldingen"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -854,7 +994,7 @@ msgstr ""
 "Behoudt aspect ratio en schaal afbeelding aan de hand van de schermhoogte "
 "als beeld breedte voor het bekijken in landscape modus."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -862,7 +1002,7 @@ msgstr ""
 "Gebruik voor rechts-naar-links publicaties zoals manga. Hierdoor worden "
 "landscape paginas gesplitst in portret paginas van rechts naar links."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
@@ -870,7 +1010,7 @@ msgstr ""
 "Activeer ontspikkelen. Verminderd spikkel ruis. Dit kan de verwerkingstijd "
 "flink verlengen."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -878,14 +1018,14 @@ msgstr ""
 "Sorteer de bestanden in de comic niet alfabetisch op naam - gebruik de "
 "voldorde waarin ze zijn toegevoegd aan de comic."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
@@ -893,22 +1033,22 @@ msgstr ""
 "Uitgebreide informatie, handig voor debuggen. Kan meerdere malen worden "
 "opgegeven voor meer informatie."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Laat geen vootgangsbalk zien"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Uitvoer weggeschreven naar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Generatie comic bladzijden..."
 
@@ -957,56 +1097,56 @@ msgstr "Opties om het gedrag van html2lrf te beĆÆnvloeden."
 msgid "Fetching of recipe failed: "
 msgstr "Ophalen van recept mislukt: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer bestand herkend."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tLezen HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen bestand herkend. Her-lezen..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "Schrijf pre-info HTML naar "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Verwerking %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tConveteer naar BBEB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Kan bestand niet parseren: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s is een leeg bestand"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "Link %s %s kan niet worden geparseerd"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Link %s kan niet worden toegevoegd aan de inhoudsopgave"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Niet mogelijk om afbeelding %s te verwerken. Foutmelding: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Niet mogelijk om interlaced PNG bestand %s te verwerken."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -1014,14 +1154,14 @@ msgstr ""
 "Niet mogelijk om afbeelding %s te verwerken\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "Een fout is opgetreden tijdens het verwerken van een tabel: %s. Tabel opmaak "
 "zal worden genegeerd."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1029,11 +1169,11 @@ msgstr ""
 "Foutieve tabel:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "Tabel heeft een cel die te groot is."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1041,19 +1181,19 @@ msgstr ""
 "De website %s moet eerst als een HTML bestand worden weggeschreven, waarna "
 "je deze met html2rlf kunt converteren."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Omslag afbeelding kan niet worden ingelezen: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Kan niet lezen van: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Verwerking van OPF bestand is niet gelukt."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1299,17 +1439,17 @@ msgstr "Geef de omschrijving"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Titel"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Auteur(s)"
 
@@ -1328,25 +1468,25 @@ msgstr "Categorie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Opmerkingen"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Tags"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Serie"
@@ -1355,23 +1495,23 @@ msgstr "Serie"
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr "En lijst tags, gescheiden door komma's"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1467,7 +1607,7 @@ msgstr "Gebruik: %s bestand.lit"
 msgid "Cover saved to"
 msgstr "omslag weggeschreven naar"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1479,11 +1619,11 @@ msgstr "Gebruik: pdf-meta bestand.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [opties] mijnboek.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "RAW MOBI HTML bewaard in"
 
@@ -1492,7 +1632,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "Vaak gebruikte folders"
 
@@ -1562,6 +1702,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "Apparaat niet meer verbonden."
@@ -1597,9 +1749,9 @@ msgstr "Bekijk book op apparaat"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pad"
 
@@ -1607,8 +1759,8 @@ msgstr "Pad"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formaten"
@@ -1622,6 +1774,7 @@ msgstr "Dialoogvenster"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1697,68 +1850,128 @@ msgstr "Ont&spikkel"
 msgid "&Wide"
 msgstr "&Wijd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Foutieve database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Moet een folder zijn."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Foutieve database locatie "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Foutieve database locatie.<br>Kan niet schrijven naar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Database aan het comprimeren. Dit kan even duren."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Comprimeren..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1766,16 +1979,17 @@ msgstr ""
 "&Locatie van eboeken. (De eboeken zijn opgeslagen in de folders gesorteerd "
 "op auteur, en metadata word bewaard in eht bestand metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Blader naar de nieuwe database locatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1791,43 +2005,35 @@ msgstr "Blader naar de nieuwe database locatie"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Notificeer als een &nieuwe versie beschikbaar is"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "Vraag &bevestiging alvorens bestanden te verwijderen"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "Opglagformaat voor &enkel bestand:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&Prioriteit van conversie batch"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "Standaard netwerk &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
@@ -1835,147 +2041,168 @@ msgstr ""
 "Geef de standaard timeout voor netwerk downloads. (bv. wanneer we informatie "
 "van het Internet moeten halen)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " seconden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "Voeg een folder toe aan de lijst met vaak gebruikte folders"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Verwijder een folder van de lijst met vaak gebruikte folders"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "Gebruik &Romeinse nummers voor de series"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr "&Aantal covers zichtbaar in blader modus (na herstart):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Groot"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Middel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Klein"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "&Knop grootte in werkbalk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "Laat &tekst zien in werkbalk knoppen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "Selecteer zichtbare &kolommen in bibliotheek weergave"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Geef ongebruikte diskruimte uit de database terug"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "&Comprimeer database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Metadata van bestands naam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "Gebr&uikersnaam:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "W&achtwoord:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "&Geef wachtwoord weer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1984,6 +2211,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "FOUT"
@@ -2001,7 +2266,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Metadata"
 
@@ -2055,25 +2320,25 @@ msgstr "Kies cover voor "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Kan niet lezen"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Je hebt geen permissie om het bestand te lezen: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Fout bij het lezen van bestand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>Er is een fout opgetreden bij het lezen van bestand: <br /><b>"
 
@@ -2083,7 +2348,7 @@ msgid " is not a valid picture"
 msgstr " is geen geldige afbeelding"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Kan niet converteren"
 
@@ -2125,22 +2390,22 @@ msgid "Book Cover"
 msgstr "Boek Omslag"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Gebruik omslag van &bron bestand"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Verander &Omslag Afbeelding"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Zoek een afbeelding om als omslag voor dit boek te gebruiken."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Gebruik omslag van &bron bestand"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2155,14 +2420,14 @@ msgstr "Verander de titel van dit boek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Auteur(s) "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2185,14 +2450,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Uitgeverij "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Verander de uitgever van dit boek"
@@ -2205,7 +2470,7 @@ msgstr "Ta&gs "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2217,7 +2482,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Series:"
@@ -2226,8 +2491,8 @@ msgstr "&Series:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2659,35 +2924,25 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
-"font-weight:400; font-style:normal;\">\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Verander Meta informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "Auteur S&ortering: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2696,48 +2951,52 @@ msgstr ""
 "Geef aan hoe de auteur(s) van dit boeken dienen te worden gesorteerd. "
 "Bijvoorbeeld: Charles Dickens moet worden gesorteerd als: Dickens, Charles"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Rangschikking"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Rangschikking van dit boek. 0-5 sterren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " sterren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "Voeg Ta&gs Toe: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Open Tag Editor"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "&Verwijder tags:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 "Lijst van tags die moeten worden verwijderd, gescheiden met komma's. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2747,19 +3006,19 @@ msgstr ""
 "<br/>Als u deze niet heeft, dan kunt u er gratis een krijgen door te <a "
 "href='http://www.librarything.com'>registreren</a></p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Omslag kon niet worden gedownload</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Omslag kon niet worden gedownload"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Kan omslag niet downloaden"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Het ISBN nummer voor dit boek moet worden opgegeven."
 
@@ -2823,93 +3082,112 @@ msgstr "Wachtwoord wijzigen"
 msgid "Password needed"
 msgstr "Wachtwoord Noodzakelijk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "Voeg een persoonlijke nieuwsbron toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Recepten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " dagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -3068,25 +3346,25 @@ msgstr "Deze feed is al aan een recept toegevoegd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "Ongeldige invoer"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>Een recept kon niet worden aangemaakt. Foutmelding:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Recept vervangen?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr "Een persoonlijk recept genaat %s bestaat al. Wilt u deze vervangen?"
 
@@ -3098,7 +3376,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr "Kies een recept"
 
@@ -3342,53 +3620,63 @@ msgstr "Wachten"
 msgid "Working"
 msgstr "Bezig"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "Opdracht kan niet worden afgebroken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 "Taken die met het apparaat communicaren kunnen niet worden afgebroken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr "Taak is al uitgevoerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "Grootte (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Waardering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Geen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Boek <font face=\"serif\">%s</font> van %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Tijdsaanduiding"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Zoeken (Voor geavanceerd zoeken klik op de knop links)"
 
@@ -3418,7 +3706,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Geen Resultaten</b> voor de zoekterm <i>%s</i> gevonden."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Geen resultaten gevonden"
 
@@ -3443,12 +3731,12 @@ msgid "Previous Page"
 msgstr "Vorige Pagina"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "Terug"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Verder"
 
@@ -3457,7 +3745,7 @@ msgid "Next match"
 msgstr "Volgende overeenkomst"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Open eboek"
 
@@ -3465,23 +3753,27 @@ msgstr "Open eboek"
 msgid "Configure"
 msgstr "Configureer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3489,127 +3781,127 @@ msgstr ""
 "<p>Voor assistentie, bezoek <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 "<b>%s</b>: %s door <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "Stuur naar hoofdgeheugen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "Stuur naar opslag kaart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr "en verwijder uit bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "Bewaar standaard op geheugen kaart"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Bewerk metadata individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Bewerk metadata in groep"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "Voeg boeken toe uit een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"Voeg recursief boeken toe (Een boek per folder, neemt aan dat ieder eboek "
-"bestand hetzelfde boek is in een ander formaat)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"voeg recursief boeken toe (Meerdere boeken per folder, neemt aan dat ieder "
-"eboek bestand een ander boek is)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Opslaan op schijf in een enkele folder"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Bewaar alleen %s formaat op schijf"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Bekijk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Bekijk specifiek formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Converteer Individueel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Converteer Groep"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr "Zet standaarden voor conversie van comics"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr "Kies een locatie voor de eboek  bibliotheek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr "Migratie database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "Apparaat: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " gedetecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Verbonden "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "Apparaat Database Beschadigd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3638,8 +3930,25 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
@@ -3647,100 +3956,119 @@ msgstr ""
 "<p>Boeken met de volgende titels bestaan al in de database. Wil je ze echt "
 "toevoegen?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Duplicaten gevonden!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "Boeken worden geupload naar de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "Geen schijfruimte op de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>De boeken kunnen niet worden geupload naar de lezer, omdat er onvoldoende "
 "schijfruimte beschikbaar is "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
-msgstr "Bevesting verwijdering"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr "Weet u zeker dat u deze %d bestanden wilt verwijderen?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "Boeken worden verwijderd van de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Metedata kan niet worden gewijzigd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Geen boeken geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "Boeken worden naar de lezer verzonden."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "Geen geschikte formaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3748,15 +4076,15 @@ msgstr ""
 "De volgende boeken konden niet naar de lezer worden deupload, omdat geen "
 "geschikt formaat werd gevonden:<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Kan niet naar schijf worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3764,59 +4092,64 @@ msgstr ""
 "<p>De volgende boeken konden niet worden bewaard op schijf, omdat het %s "
 "formaat niet beschikbaar is:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Sommige boeken konden niet worden opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "Downloading nieuws van "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Geen boek geselecteerd"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Kan niet bekijken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Kies het te bekijken formaat"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s heeft geen beschikbare formaten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Kan niet configureren"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Can niet configueren terwijl bestaande opdrachten bezig zijn"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Copieer bibliotheek naar "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "ongeldige database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -3824,23 +4157,23 @@ msgstr ""
 "<p>Een ongeldige database bestaat op %s, verwijder deze voordat je probeert "
 "de bestaande database te verplaatsen.<br>Foutmelding: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "Database kon niet worden verplaatst"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "Geen details beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr "Geen details zijn beschikbaar voor de boeken op de lezer."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Fout bij communicatie met lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -3848,23 +4181,23 @@ msgstr ""
 "Er is een tijdelijke fout opgetreden tijdens de communicatie met de lezer. "
 "verwijzer de lezer en plug hem opnieuw in, of herstart."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Converteer Fout"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "database bestaat niet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -3872,38 +4205,38 @@ msgstr ""
 "De folder waarin de database zou moetten zijn: %s bestaat niet meer. Kies "
 "een nieuwe database locatie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr "Kies een nieuwe locatie voor de database"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -3911,7 +4244,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Laatste versie: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -3921,39 +4254,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">nieuwe functies</a> "
 "Bezoek download pagina?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "Update beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "Calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "Geavanceerde Zoekopdracht"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "&Zoeken:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -3961,7 +4294,7 @@ msgstr ""
 "Zoek de boekenlijst op titel of auteur<br><br>Meerdere woorden met spaties "
 "worden allen gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -3969,75 +4302,99 @@ msgstr ""
 "Zoek de boekenlijst op titel, auteur, uitgeverij, tags of "
 "opmerkingen.<br><br>Meerdere woorden met spaties worden allen gebruikt."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Snelzoeken wissen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "Voeg boeken toe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Verwijder boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Wijzig meta informatie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "Zend naar lezer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Download niews"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "Converteer E-boeken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -4050,23 +4407,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "FOUT: Niet-verwerkte uitzondering"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Opdrachten"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Klik om een lijst met actieve opdrachten te zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Klik om boeken bij hun omslag te bekijken"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Klik om zoeken op omslag uit te schakelen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4074,7 +4431,7 @@ msgstr ""
 "<p>Bekijken van boeken op omslag is uitgeschakeld.<br>Importeren van "
 "pictureflow module is mislukt:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -4219,7 +4576,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4243,109 +4600,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "Ongeldige reguliere expressie"
@@ -4354,36 +4715,37 @@ msgstr "Ongeldige reguliere expressie"
 msgid "Invalid regular expression: %s"
 msgstr "Ongeldige reguliere expressie: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Bibliotheek"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Lezer\n"
-"%s beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Kaart\n"
-"%s beschikbaar"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr "Klik om een de lijst met boeken op uw computer te zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Klik om de lijst met boeken in het hoofdgeheugen van uw lezer te zien"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr "Klik om de lijst met boeken op de opslag kaart van uw lezer te zien"
 
@@ -4411,6 +4773,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4707,79 +5073,87 @@ msgstr ""
 "\n"
 "Voor help met een specifiek commando: %%prog command --help\n"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr "Copieer <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Migreer oude database naar eboek bibliotheek in %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr "Comprimeren database"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "Werker sessie kan niet worden gestart."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr "Taak gestopt door gebruiker"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sGebruik%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Gemaakt door "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr "Pad naar de database waarin boeken zijn opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr "Patroon om metadata uit bestandsnamen te voorspellen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr "Toegangssleutel voor isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr "Standaard timeout voor netwerk operaties"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr "Pad naar folder waarin je bibliotheek is opgeslagen"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr "De fontconfig bibliotheek kon niet worden geinitialiseerd."
 
@@ -4799,13 +5173,13 @@ msgstr "SSH sessie kon niet tot stand worden gebracht: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Authenticatie met server mislukt: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Onbekende feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "Artikel zonder naam"
 
@@ -4818,7 +5192,7 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -4827,7 +5201,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -4836,7 +5210,7 @@ msgstr ""
 "%default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -4845,7 +5219,7 @@ msgstr ""
 "Standaard zal er worden geprobeerd om de codering te raden."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4857,7 +5231,7 @@ msgstr ""
 "expressie. Standaard zullen alle links worden gevolgd."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4872,7 +5246,7 @@ msgstr ""
 "regexp worden gebruikt, dan zal --filter-regexp allereerst worden toegepast."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "Download geen CSS stylesheets"
 
@@ -5002,69 +5376,69 @@ msgid "Dont show the progress bar"
 msgstr "Laat geen progressie zien"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "Downloading feeds..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Onbekende Nieuwe Bron"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Download voltooid"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "De volgende artikelen konden niet worden gedownload:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " van "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Delen van de volgende artikelen konden niet worden gedownload:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tMislukte links:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 "Artikel kon niet worden gedownload. Draai met --debug om de reden te zien"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "feeds van index pagina"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "Probeer omslag te downloaden"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Begin download [%d thread(s)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feeds gedownload tot %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "Kon omslag niet downloaden: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "Download omslag van %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "Artikel zonder Naam"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -5074,23 +5448,23 @@ msgstr ""
 "Artikel %s van %s gedownload\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "Artikel gedownload: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "Artikel %s van %s kon niet worden gedownload\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Artikel download mislukt: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "Downloading feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -5100,12 +5474,12 @@ msgstr ""
 "\n"
 "Waar URL is bijvoorbeeld http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 "basis folder waar de URL naar toe word geschreven. Standaard is %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
@@ -5113,7 +5487,7 @@ msgstr ""
 "Maximum aantal level om recursief te zoeken -- de diepte om links te volgen. "
 "Standaard %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5121,7 +5495,7 @@ msgstr ""
 "Het maximum aantal bestanden te downloaden. Dit is alleen van toepassing op "
 "bestanden in <a href> tags. Standaard is %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 "Laat gedetailleerde output informatie zien. Handig bij het opsporen van "
@@ -5166,6 +5540,9 @@ msgstr ""
 #~ msgid "&Location of books database (library1.db)"
 #~ msgstr "&Locatie van boek database )library1.db)"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&Prioriteit van conversie batch"
+
 #~ msgid "&Access Key;"
 #~ msgstr "&Toegangssleutel"
 
@@ -5238,6 +5615,20 @@ msgstr ""
 #~ msgid "<b>Changes will only take affect after a restart."
 #~ msgstr "<b>Veranderingen zijn pas zichtbaar na een herstart."
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "Voeg recursief boeken toe (Een boek per folder, neemt aan dat ieder eboek "
+#~ "bestand hetzelfde boek is in een ander formaat)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "voeg recursief boeken toe (Meerdere boeken per folder, neemt aan dat ieder "
+#~ "eboek bestand een ander boek is)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Nieuws gedownload, uploading naar lezer."
 
@@ -5252,6 +5643,23 @@ msgstr ""
 #~ msgid "Custom news sources"
 #~ msgstr "Persoonlijke nieuws bronnen"
 
+#~ msgid "Library"
+#~ msgstr "Bibliotheek"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Lezer\n"
+#~ "%s beschikbaar"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Kaart\n"
+#~ "%s beschikbaar"
+
 #~ msgid "Job killed by user"
 #~ msgstr "Opdracht beƫindigd door gebruiker"
 
@@ -5268,6 +5676,29 @@ msgstr ""
 #~ msgid " does not allow copying of text."
 #~ msgstr " staat copieren van tekst niet toe."
 
+#~ msgid ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+#~ msgstr ""
+#~ "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+#~ "\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+#~ "<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+#~ "type=\"text/css\">\n"
+#~ "p, li { white-space: pre-wrap; }\n"
+#~ "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+#~ "font-weight:400; font-style:normal;\">\n"
+#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+#~ "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
+#~ "family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+
 #~ msgid ""
 #~ "Path to the calibre database. Default is to use the path stored in the "
 #~ "settings."
@@ -5397,6 +5828,15 @@ msgstr ""
 #~ "Standaard is de SONY PRS-500 met een scherm grootte van 584x754 pixels. "
 #~ "Keuzes zijn %s"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Vraag &bevestiging alvorens bestanden te verwijderen"
+
+#~ msgid "Confirm delete"
+#~ msgstr "Bevesting verwijdering"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Weet u zeker dat u deze %d bestanden wilt verwijderen?"
+
 #~ msgid ""
 #~ "%prog [options] comic.cb[z|r]\n"
 #~ "\n"
diff --git a/src/calibre/translations/pl.po b/src/calibre/translations/pl.po
index b875428631..3deb19c0c2 100644
--- a/src/calibre/translations/pl.po
+++ b/src/calibre/translations/pl.po
@@ -7,206 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-11-25 23:58+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2009-01-03 20:09+0000\n"
+"Last-Translator: Radian <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
-msgid "Unable to detect the %s disk drive. Try rebooting."
-msgstr "Wykrycie dysku %s niemożliwe. SprĆ³buj ponownie uruchomić komputer."
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Ta opcja nic nie zmienia"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
-msgid "The reader has no storage card connected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
-msgid "Options to control the conversion to EPUB"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
-msgid ""
-"The output EPUB file. If not specified, it is derived from the input file "
-"name."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
-msgid ""
-"Profile of the target device this EPUB is meant for. Set to None to create a "
-"device independent EPUB. The profile is used for device specific "
-"restrictions on the EPUB. Choices are: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
-msgid ""
-"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
-"existing CSS declarations in the source files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
-msgid "Control auto-detection of document structure."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
-msgid ""
-"An XPath expression to detect chapter titles. The default is to consider "
-"<h1> or\n"
-"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
-"\"part\" as chapter titles as \n"
-"well as any tags that have class=\"chapter\". \n"
-"The expression used must evaluate to a list of elements. To disable chapter "
-"detection,\n"
-"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
-"for further\n"
-"help on using this feature.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
-msgid ""
-"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
-"page breaks before chapters. A value of \"rule\" will insert a line before "
-"chapters. A value of \"none\" will disable chapter marking and a value of "
-"\"both\" will use both page breaks and lines to mark chapters."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
-msgid "Path to the cover to be used for this book"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
-msgid ""
-"Use the cover detected from the source file in preference to the specified "
-"cover."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
-msgid ""
-"Control the automatic generation of a Table of Contents. If an OPF file is "
-"detected\n"
-"and it specifies a Table of Contents, then that will be used rather than "
-"trying\n"
-"to auto-generate a Table of Contents.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
-msgid ""
-"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
-"is: %default. Links are only added to the TOC if less than the --toc-"
-"threshold number of chapters were detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
-msgid "Don't add auto-detected chapters to the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
-msgid ""
-"If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level one. If this is specified, it takes precedence over "
-"other forms of auto-detection."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level two. Each entry is added under the previous level one "
-"entry."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
-msgid ""
-"Path to a .ncx file that contains the table of contents to use for this "
-"ebook. The NCX file should contain links relative to the directory it is "
-"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
-"an overview of the NCX format."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
-msgid ""
-"Normally, if the source file already has a Table of Contents, it is used in "
-"preference to the autodetected one. With this option, the autodetected one "
-"is always used."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
-msgid "Control page layout"
-msgstr "Wygląd strony kontrolnej"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
-msgid "Set the top margin in pts. Default is %default"
-msgstr "Ustaw margines gĆ³rny w punktach. Domyślna wartość: %default"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
-msgid "Set the bottom margin in pts. Default is %default"
-msgstr "Ustaw margines dolny w punktach. Domyślna wartość: %default"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
-msgid "Set the left margin in pts. Default is %default"
-msgstr "Ustaw lewy margines w punktach. Domyślna wartość: %default"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
-msgid "Set the right margin in pts. Default is %default"
-msgstr "Ustaw prawy margines w punktach. Domyślna wartość: %default"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
-msgid ""
-"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
-"rescaling of fonts."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
-msgid ""
-"Remove spacing between paragraphs. Will not work if the source file forces "
-"inter-paragraph spacing."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
-msgid ""
-"Preserve the HTML tag structure while splitting large HTML files. This is "
-"only neccessary if the HTML files contain CSS that uses sibling selectors. "
-"Enabling this greatly slows down processing of large HTML files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
-msgid "Print generated OPF file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
-msgid "Print generated NCX file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
-msgid "Keep intermediate files during processing by html2epub"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
-msgid ""
-"Extract the contents of the produced EPUB file to the specified directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
@@ -219,22 +43,27 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:245
@@ -242,27 +71,381 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1392
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1423
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Baza"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Typ pliku"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Czytnik metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Zapisywacz metadanych"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+"Podąż za wszystkimi lokalnymi linkami w pliku HTML i stwĆ³rz plik ZIP "
+"zawierający wszystkie podlinkowane pliki. Ta wtyczka jest uruchamiana za "
+"każdym razem, gdy dodasz plik HTML do biblioteki."
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Odczytaj metadane z %s plikĆ³w"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr "Wyodrębnij okładki z plikĆ³w komisĆ³w"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr "Ustaw metadane w plikach EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr "Ustaw metadane w plikach LRF"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr "Ustaw metadane w plikach RTF"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "Zainstalowane wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr "Lokalne dostosowanie wtyczek"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr "Wyłączone wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr "Nie znaleziono wtyczki w "
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr "Dodaj wtyczkę przez podanie ścieżki do pliku, ktĆ³ry ją zawiera."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+"Usuń wtyczkę użytkownika - po nazwie. Nie ma wpływu na wtyczki wbudowane."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+"Dostosuj wtyczkę. WprowadÅŗ nazwę wtyczki i polecenie dostosowujące "
+"oddzielając przecinkami."
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr "Wyświetl wszystkie zainstalowane wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr "Włącz wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr "Wyłącz wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr "Wykrycie dysku %s niemożliwe. SprĆ³buj ponownie uruchomić komputer."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
+msgid "The reader has no storage card connected."
+msgstr "Brak karty pamięci w czytniku."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
+msgid "Options to control the conversion to EPUB"
+msgstr "Opcje kontrolujące konwersję do EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+"Nazwa wyjściowego pliku EPUB. Jesli nie jest podana, zostanie utworzona na "
+"podstawie nazwy pliku ÅŗrĆ³dłowego."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+"Profil docelowego urządzenia dla tego pliku EPUB. Wybranie \"Żadne\" "
+"skutkuje utworzeniem pliku niezależnego od urządzenia. Profile są używane do "
+"ustalenia zależnych od urządzenia restrykcji EPUB. Możliwe wybory: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+"Ścieżka do arkusza stylĆ³w CSS lub surowego CSS. Ten plik CSS zastąpi "
+"wszystkie deklaracje w plikach ÅŗrĆ³dłowych."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid "Control auto-detection of document structure."
+msgstr "Kontrola autodetekcji struktury dokumentu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+"Wyrażenie XPath używane do wykrywania rozdziaÅ‚Ć³w. Domyślnie za tytuły "
+"rozdziaÅ‚Ć³w uważane są\n"
+"etykiety <h1> lub <h2> zawierające słowa \"rozdział\", \"książka\", "
+"\"sekcja\" lub \"część\". To samo dotyczy dowolnych\n"
+"etykiet zawierających klasę rozdziału (class=\"chapter\"). \n"
+"Użyte wyrażenie musi określać listę elementĆ³w. Aby wyłączyć wykrywanie "
+"rozdziaÅ‚Ć³w,\n"
+"użyj wyrażenia \"/\". Samouczek XPath w Instrukcji użytkownika calibre "
+"porusza to\n"
+"zagadnienie dokładniej.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+"Określ jak zaznaczać wykryte rozdziały. Wartość \"przerwa\" wstawia stronę "
+"przerwy między rozdziałami. Wartość \"linia\" wstawia linię między "
+"rozdziałami. Wartość \"brak\" wyłącza zaznaczanie rozdziaÅ‚Ć³w, a \"wszystko\" "
+"włącza linie i strony przerw jednocześnie."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+msgid "Path to the cover to be used for this book"
+msgstr "Ścieżka do okładki dla tej książki"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr "Preferuj okładkę z pliku ÅŗrĆ³dłowego w stosunku do wybranej okładki."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+"Kontroluj automatyczne tworzenie spisu treści (TOC). Jeśli plik OPF zostanie "
+"wykryty\n"
+"i wskazuje na spis treści (TOC), będzie on użyty zamiast prĆ³by\n"
+"automatycznego tworzenia spisu.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+"Maksymalna ilość odnośnikĆ³w dodawanych do spisu treści (TOC). Ustaw 0 aby "
+"wyłączyć ograniczenie. Domyślna wartość to: %default. Odnośniki są dodawane "
+"do TOC tylko jeśli wykryto mniej rozdziaÅ‚Ć³w niż --toc-threshold."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr "Nie dodawaj automatycznie wykrytych rozdziaÅ‚Ć³w do Spisu Treści"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+"Jeśli wykryto mniej niż tyle rozdziaÅ‚Ć³w, odnośniki są dodawane do spisu "
+"treści (TOC). Domyślnie: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+"Wyrażenie XPatch określa wszystkie znaczniki ktĆ³re powinny być dodane do "
+"zawartości spisu treści na poziomie pierwszym, przed wszystkimi formami auto-"
+"wykrywania."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+"Wyrażenie XPath ktĆ³re określa wszystkie etykiety powinno być dodane do "
+"zawartości tabli na poziomie drugim. Każde wejście jest dodawane pod "
+"wcześniejszy pierwszy poziom."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+"Ścieżka do pliku .ncx, ktĆ³ry zawiera spis treści użytego w e-booku. Plik NCX "
+"powinien zawierać odnośniki relatywne do katalogu w ktĆ³rym się znajduje. "
+"Zobacz na: http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX do "
+"przeglądu formatu NCX."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the autodetected one. With this option, the autodetected one "
+"is always used."
+msgstr ""
+"Zwykle, jeśli plik ÅŗrĆ³dłowy zawiera już spis treści (TOC), jest on "
+"preferowany w stosunku do wygenerowanego automatycznie. Ta opcja wymusza "
+"użycie spisu automatycznego."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
+msgid "Control page layout"
+msgstr "Wygląd strony kontrolnej"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid "Set the top margin in pts. Default is %default"
+msgstr "Ustaw margines gĆ³rny w punktach. Domyślna wartość: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr "Ustaw margines dolny w punktach. Domyślna wartość: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
+msgid "Set the left margin in pts. Default is %default"
+msgstr "Ustaw lewy margines w punktach. Domyślna wartość: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
+msgid "Set the right margin in pts. Default is %default"
+msgstr "Ustaw prawy margines w punktach. Domyślna wartość: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+"Rozmiar czcionki podstawowej w punktach. Domyślna to %default pt. Ustawienie "
+"wartości na 0 zapobiegnie skalowaniu czcionek."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
+msgid ""
+"Remove spacing between paragraphs. Will not work if the source file forces "
+"inter-paragraph spacing."
+msgstr ""
+"Usuwaj odstępy pomiędzy paragrafami. Nie zadziała, jeśli plik ÅŗrĆ³dłowy "
+"wymusza odstępy wewnątrz-paragrafowe."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+"Zachowaj strukturę znacznikĆ³w HTML podczas podziału dużych plikĆ³w HTML. "
+"Wymagane tylko, gdy plik HTML zawiera arkusz CSS, ktĆ³ry używa bliÅŗniaczych "
+"znacznikĆ³w (sibling selectors). Włączenie spowolni przetwarzanie duzych "
+"plikĆ³w HTML."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
+msgid "Print generated OPF file to stdout"
+msgstr "Wydrukuj utworzony plik OPF na standardowe wyjście"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
+msgid "Print generated NCX file to stdout"
+msgstr "Wydrukuj utworzony plik NCX na wyjście standardowe"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
+msgid "Keep intermediate files during processing by html2epub"
+msgstr "Zachowaj pliki pośrednie podczas przetwarzania przez html2epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr "Wypakuj zawartość utworzonego pliku EPUB do podanego katalogu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
+"%%prog [opcje] nazwa_pliku\n"
+"\n"
+"Konwertuj jeden z wielu dostępnych formatĆ³w e-booka do pliku %s. Wspierane "
+"formaty: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
-msgstr ""
+msgstr "Nie znaleziono e-book'a w archiwum"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -272,108 +455,131 @@ msgid ""
 "takes from\n"
 "the <spine> element of the OPF file.  \n"
 msgstr ""
+"Konwertuj plik HTML na e-book EPUB. Rekurencyjnie podąża za odnośnikami w "
+"pliku HTML. \n"
+"Jeśli wybierzesz plik OPF zamiast pliku HTML, lista odnośnikĆ³w będzie brana "
+"z elementu <spine> w pliku OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr "Plik wyjściowy zapisany w "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
-msgstr ""
+msgstr "Musisz podać wejściowy plik HTML"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
 msgid "%s format books are not supported"
-msgstr ""
+msgstr "książki formatu %s nie są wspierane"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
+"Nie można znaleÅŗć odpowiedniego punktu do podziału %s. Rozmiar pod-drzewa: "
+"%d KB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
+"\t\tZa dużo oznaczeń. Ponowne dzielenie bez zachowania struktury. Może to "
+"doprowadzić do złego renderowania."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
-msgstr ""
+msgstr "Zapisz przekształcony HTML w "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
-msgstr ""
+msgstr "Opcje do kontroli traversal w HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
-msgstr ""
+msgstr "Folder wyjściowy. Domyślny folder to folder bieżący."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
+"Kodowanie znakĆ³w dla plikĆ³w HTML. Domyślnie jest to wybĆ³r automatyczny."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
+"StwĆ³rz plik formatu .zip. Jeśli ta opcja jest zaznaczona, wartość --output "
+"powinna być nazwą pliku a nie katalogu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
-msgstr ""
+msgstr "Kontrola śledzenia odnośnikĆ³w w plikach HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
+"PrzechodÅŗ przez odnośniki w plikach HTML wszerz. Standardowo używany jest "
+"algorytm wgłębny."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
-msgid "Set metadata of the generated ebook"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
-msgid "Set the title. Default is to autodetect."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
-msgid "The author(s) of the ebook, as a comma separated list."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
-msgid "The subject(s) of this book, as a comma separated list."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
-msgid "Set the publisher of this book."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
-msgid "A summary of this book."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
-msgid "Load metadata from the specified OPF file"
-msgstr ""
+"Maksymalny poziom rekurencji podczas podążania za linkami w plikach HTML. "
+"Musi być liczbą nieujemną. 0 oznacza, że w gÅ‚Ć³wnym pliku html nie podąża się "
+"za żadnymi linkami."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+msgid "Set metadata of the generated ebook"
+msgstr "Ustaw metadane w wygenerowanym e-booku."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+msgid "Set the title. Default is to autodetect."
+msgstr "Ustaw tytuł ksiązki. Domyślnie jest on wykrywny automatycznie."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+msgid "The author(s) of the ebook, as a comma separated list."
+msgstr "Autor(rzy) książki, jako lista rozdzielona przecinkami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
+msgid "The subject(s) of this book, as a comma separated list."
+msgstr "Temat(y) tej książki, jako lista rozdzielona przecinkami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
+msgid "Set the publisher of this book."
+msgstr "Ustaw wydawcę tej książki"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+msgid "A summary of this book."
+msgstr "Podsumowanie tej książki."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
+msgid "Load metadata from the specified OPF file"
+msgstr "Wczytaj metadane ze wskazanego pliku OPF"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Opcje przydatne do diagnostyki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
+"Wyświetlaj szczegĆ³Å‚owe komunikaty w czasie pracy. Zaznaczenie w wielu "
+"miejscach zwiększa liczbę szczegĆ³Å‚Ć³w."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
-msgstr ""
+msgstr "Wyjściowy HTML jest \"ładnie drukowany\" dla łatwiejszej analizy"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -385,75 +591,104 @@ msgid ""
 "element\n"
 "is used.\n"
 msgstr ""
+"%prog [options] file.html|opf\n"
+"ŚledÅŗ wszystkie odnośniki w pliku HTML i zapisz je w podanej ścieżce.\n"
+"Przechwytuje także inne ÅŗrĆ³dła referencji takie jak zdjęcia, zestawy stylĆ³w, "
+"skrypty, itd.\n"
+"Jeśli plik OPF jest wyszczegĆ³lniony, lista plikĆ³w w jego elemencie <spine> "
+"jest używana.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr "StwĆ³rz plik LIT z pliku EPUB..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
 msgid "%prog [options] LITFILE"
-msgstr ""
+msgstr "%prog [opcje] LITFILE"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
 msgid "Output directory. Defaults to current directory."
 msgstr "Folder docelowy. Domyślnie to aktualny folder."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
 msgid "Legibly format extracted markup. May modify meaningful whitespace."
 msgstr ""
+"Czytelny format znacznikĆ³w eksploatacyjnych. Mogą modyfikować białą "
+"przestrzeń"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
-msgstr ""
+msgstr "Użyteczne dla debugowania."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
+msgstr "OEB ebook stworzony w"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr "%prog [opcje] OPFFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
 msgstr ""
+"Plik wynikowy. Nazwa domyślnie jest generowana na podstawie nazwy pliku "
+"wejściowego."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
-msgstr ""
+msgstr "Ustaw tytuł. Domyślny to nazwa pliku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
 msgid ""
 "Set the author(s). Multiple authors should be set as a comma separated list. "
 "Default: %default"
 msgstr ""
+"Ustaw autora(Ć³w). Zbiorowych autorĆ³w powinno się wpisywać oddzielnie, jako "
+"listę rozdzieloną przecinkami. Domyślnie: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 msgid "Set the comment."
-msgstr ""
+msgstr "Dodaj komentarz."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 msgid "Set the category"
-msgstr ""
+msgstr "Ustaw kategorię"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
 msgid "Sort key for the title"
-msgstr ""
+msgstr "Rodzaj klucza dla tytułu"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:85
 msgid "Sort key for the author"
-msgstr ""
+msgstr "Sortuj wg autora"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Wydawca"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
 msgid "Path to file containing image to be used as cover"
-msgstr ""
+msgstr "Ścieżka do pliku zawierającego okładkę"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:91
 msgid ""
 "If there is a cover graphic detected in the source file, use that instead of "
 "the specified cover."
 msgstr ""
+"Jeżeli obraz okładki zostanie wykryty w pliku ÅŗrĆ³dłowym, jest używany "
+"zamiast wybranej okładki."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:94
 msgid "Output file name. Default is derived from input filename"
 msgstr ""
+"Nazwa pliku wynikowego. Domyślnie tworzona jest na podstawie nazwy pliku "
+"ÅŗrĆ³dłowego"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
 msgid ""
@@ -470,31 +705,36 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
 msgid "Enable autorotation of images that are wider than the screen width."
-msgstr ""
+msgstr "Włącz automatyczne obracanie obrazĆ³w, ktĆ³re są szersze niż ekran."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:104
 msgid "Set the space between words in pts. Default is %default"
 msgstr ""
+"Ustaw odstęp pomiędzy słowami w punktach (pt). Domyślnie wynosi on %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
 msgid "Separate paragraphs by blank lines."
-msgstr ""
+msgstr "Oddziel paragrafy przy użyciu pustych linii."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
 msgid "Add a header to all the pages with title and author."
-msgstr ""
+msgstr "Dodaj nagÅ‚Ć³wek z tytułem i autorem do wszystkich stron."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
 msgid ""
 "Set the format of the header. %a is replaced by the author and %t by the "
 "title. Default is %default"
 msgstr ""
+"Ustaw format nagÅ‚Ć³wka. %a jest zastępowane nazwiskiem autora, %t - tytułem "
+"książki. Styl domyślny: &default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:112
 msgid ""
 "Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
 "it is a string it is interpreted as CSS."
 msgstr ""
+"Zastąp CSS. Można podać ścieżkę do arkusza stylĆ³w CSS lub ciąg znakĆ³w. "
+"Podany ciąg jest interpretowany jako kod CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
 msgid ""
@@ -508,6 +748,8 @@ msgid ""
 "Minimum paragraph indent (the indent of the first line of a paragraph) in "
 "pts. Default: %default"
 msgstr ""
+"Minimalne wcięcie paragrafu (wcięcie pierwszej linii paragrafu) w pts. "
+"Domyślnie: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
 msgid ""
@@ -521,6 +763,8 @@ msgid ""
 "Render all content as black on white instead of the colors specified by the "
 "HTML or CSS."
 msgstr ""
+"Pokazuj zawartość jako czarne na białym zamiast kolorĆ³w zawartych w pliku "
+"HTML lub CSS."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:129
 msgid ""
@@ -531,31 +775,35 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:135
 msgid "Left margin of page. Default is %default px."
-msgstr ""
+msgstr "Lewy margines strony. Domyslny to %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:137
 msgid "Right margin of page. Default is %default px."
-msgstr ""
+msgstr "Prawy margines strony. Domyślny to %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:139
 msgid "Top margin of page. Default is %default px."
-msgstr ""
+msgstr "GĆ³rny margines strony. Domyślny to %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:141
 msgid "Bottom margin of page. Default is %default px."
-msgstr ""
+msgstr "Dolny margines strony. Domyślny to %default px."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:143
 msgid ""
 "Render tables in the HTML as images (useful if the document has large or "
 "complex tables)"
 msgstr ""
+"Wyświetlaj tabele w plikach HTML jako obrazki (przydatne, gdy dokument "
+"zawiera duże lub złożone tabele)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
 msgid ""
 "Multiply the size of text in rendered tables by this factor. Default is "
 "%default"
 msgstr ""
+"PomnĆ³Å¼ wielkość tekstu w wyświetlanych tabelach przez ten wspĆ³Å‚czynnik. "
+"Domyślny to %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:150
 msgid ""
@@ -572,11 +820,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
 msgid "Don't add links to the table of contents."
-msgstr ""
+msgstr "Nie dodawaj linkĆ³w do spisu treści."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
 msgid "Prevent the automatic detection chapters."
-msgstr ""
+msgstr "Zapobiegaj automatycznemu wykrywaniu rozdziaÅ‚Ć³w."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:165
 msgid ""
@@ -620,7 +868,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:185
 msgid "Add detected chapters to the table of contents."
-msgstr ""
+msgstr "Dodaj wykryte rozdziały do spisu treści."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:188
 msgid "Preprocess Baen HTML files to improve generated LRF."
@@ -631,10 +879,12 @@ msgid ""
 "You must add this option if processing files generated by pdftohtml, "
 "otherwise conversion will fail."
 msgstr ""
+"Musisz dodać tą opcję jeśli generowałeś plik przez pdftohtml, w innym "
+"przypadku konwersja nie powiedzie się."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:192
 msgid "Use this option on html0 files from Book Designer."
-msgstr ""
+msgstr "Użyj tej opcji dla plikĆ³w html0 z Book Designer."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:195
 msgid ""
@@ -646,29 +896,31 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:203
 msgid "The serif family of fonts to embed"
-msgstr ""
+msgstr "Rodzina czcionek szeryfowych do umieszczenia"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:206
 msgid "The sans-serif family of fonts to embed"
-msgstr ""
+msgstr "Rodzina czcionek sans-serif do umieszczenia"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:209
 msgid "The monospace family of fonts to embed"
-msgstr ""
+msgstr "Rodzina czcionek monospace do umieszczenia"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
 msgid "Be verbose while processing"
-msgstr ""
+msgstr "Wyświetlaj szczegĆ³Å‚owe kominukaty w czasie pracy"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:215
 msgid "Convert to LRS"
-msgstr ""
+msgstr "Konwertuj do LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
 msgid ""
 "Minimize memory usage at the cost of longer processing times. Use this "
 "option if you are on a memory constrained machine."
 msgstr ""
+"Minimalizuj użycie pamięci kosztem dłuższego czasu przetwarzania. Zaznacz tę "
+"opcję, jeśli korzystasz ze sprzętu wyposażonego w małą ilość pamięci."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
 msgid ""
@@ -678,11 +930,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
-msgstr ""
+msgstr "Konwersja z %s do LRF nie jest wspierana."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -692,121 +944,142 @@ msgid ""
 "ZIP archive, looking for an ebook inside the archive.\n"
 "    "
 msgstr ""
+"any2lrf [opcje] mĆ³j_plik\n"
+"\n"
+"Konwersja dowolnego formatu e-booka do LRF. Wspierane formaty:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC i PDF. any2lrf przetworzy rĆ³wnież "
+"archiwa RAR czy\n"
+"ZIP szukając pliku e-booka wewnątrz archiwum.\n"
+"    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
-msgid "Rendered %s"
-msgstr ""
+msgstr "Nie wybrano pliku do konwersji."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
-msgid "Failed %s"
-msgstr ""
+msgid "Rendered %s"
+msgstr "Wykonane %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
+msgid "Failed %s"
+msgstr "Nieudane %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
+"Nie udało się przetworzyć komisku: %s\n"
+"\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
-msgstr ""
+msgstr "Opcje kontrolujące konwersję plikĆ³w komiksĆ³w (CBR, CBZ) na e-booki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
+msgstr "Tytuł tworzonego e-booka. Domyślnie używana jest nazwa pliku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+"Ustawienia autora w metadanych generowanego e-booka. Domyślna wartość to "
+"%default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
+"Ścieżka do pliku wyjściowego. Domyślnie jest on tworzony w katalogu bieżącym."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
+"Liczba kolorĆ³w dla konwersji grafiki na czarno-białą. Domyślnie: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
+"Nie zezwalaj na normalizowanie (poprawianie kontrastu) głębi kolorĆ³w. "
+"Domyślne: Fałsz"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
-msgstr ""
+msgstr "Wyłącz wyostrzanie"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
-msgstr ""
+msgstr "Nie dziel grafik panoramicznych na dwie części"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
+"Wyświetlaj szczegĆ³Å‚owe komunikaty przydatne przy debugowaniu. Zaznaczenie w "
+"wielu miejscach zwiększa liczbę szczegĆ³Å‚Ć³w."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Nie pokazuj paska postępu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
+"%prog [opcje] komiks.cb[z|r]\n"
+"\n"
+"Konwersja komiksu w formacie CBR lub CBZ do e-booka. \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
-msgstr ""
+msgstr "Plik wyjściowy zapisany do"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
-msgstr ""
+msgstr "Przetwarzanie stron komiksu..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
 msgid ""
@@ -815,6 +1088,10 @@ msgid ""
 "        \n"
 "%prog converts mybook.epub to mybook.lrf"
 msgstr ""
+"Użycie: %prog [opcje] mĆ³j_e-book.epub\n"
+"        \n"
+"        \n"
+"%prog konwertuje mĆ³j_e-book.epub do mĆ³j_e-book.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:23
 msgid ""
@@ -823,11 +1100,15 @@ msgid ""
 "\n"
 "%prog converts mybook.fb2 to mybook.lrf"
 msgstr ""
+"%prog [opcje] mĆ³j_e-book.fb2\n"
+"        \n"
+"        \n"
+"%prog konwertuje mĆ³j_e-book.fb2 do mĆ³j_e-book.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
 msgid "Print generated HTML to stdout and quit."
-msgstr ""
+msgstr "Wydrukuj wygenerowany HTML do wyjścia standardowego i zamknij."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
 msgid "Keep generated HTML files after completing conversion to LRF."
@@ -835,105 +1116,109 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
 msgid "Options to control the behavior of feeds2disk"
-msgstr ""
+msgstr "Opcje kontrolujące zachowanie feeds2disk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
 msgid "Options to control the behavior of html2lrf"
-msgstr ""
+msgstr "Opcje kontrolujące zachowanie html2lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
-msgid "\tBook Designer file detected."
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+msgid "\tBook Designer file detected."
+msgstr "\twykryto plik Book Designer."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
-msgstr ""
+msgstr "\tAnalizowanie HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
-msgstr ""
+msgstr "\tWykryto plik Baen. Ponowna analiza..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
-msgstr ""
+msgstr "Zapisano wstępnie przetworziny HTML do "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Przetwarzanie %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
-msgid "Could not parse file: %s"
-msgstr ""
+msgstr "\tKonwersja do BBeB..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
+msgid "Could not parse file: %s"
+msgstr "Nie można przetworzyć pliku: %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
-msgstr ""
+msgstr "%s jest pustym plikiem"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "Analiza odnośnika %s %s nie powiodła się"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "Nie można dodać odnośnika %s do spisu treści"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
-msgstr ""
+msgstr "Nie można przetworzyć obrazu %s. Błąd: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
+"Nie można przetworzyć obrazu: %s\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
-msgstr ""
+msgstr "Błąd podczas przetwarzania tabeli: %s. Ignoruję znaczniki tabel."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
+"Nieprawidłowy spis:\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
-msgstr ""
+msgstr "Tabela zawiera zbyt dużą komĆ³rkę"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
-msgstr ""
+msgstr "Nie można odczytać grafiki okładki: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
-msgstr ""
+msgstr "Nie można odczytać z: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
-msgstr ""
+msgstr "Nie udało się przetworzyć pliku opf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -960,11 +1245,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:135
 msgid "Output LRS file"
-msgstr ""
+msgstr "Wyjściowy plik LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:153
 msgid "Parsing LRF..."
-msgstr ""
+msgstr "Analizowanie LRF..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:156
 msgid "Creating XML..."
@@ -972,17 +1257,19 @@ msgstr "tworzenie XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "LRS written to "
-msgstr ""
+msgstr "Plik LRS zapisany do "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:249
 msgid "Could not read from thumbnail file:"
-msgstr ""
+msgstr "Nie można przeczytać z pliku miniaturki:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:269
 msgid ""
 "%prog [options] file.lrs\n"
 "Compile an LRS file into an LRF file."
 msgstr ""
+"%prog [opcje] file.lrs\n"
+"Skompiluj plik LRS do pliku LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:270
 msgid "Path to output file"
@@ -991,7 +1278,7 @@ msgstr "Ścieżka do pliku wyjściowego"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:272
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:115
 msgid "Verbose processing"
-msgstr ""
+msgstr "SzczegĆ³Å‚owe komunikaty w czasie pracy"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:274
 msgid "Convert LRS to LRS, useful for debugging."
@@ -999,7 +1286,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
 msgid "Invalid LRF file. Could not set metadata."
-msgstr ""
+msgstr "Niewłaściwy plik LRF. Nie moża ustawić metadanych."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
 msgid ""
@@ -1009,6 +1296,11 @@ msgid ""
 "Show/edit the metadata in an LRF file.\n"
 "\n"
 msgstr ""
+"%prog [opcje] mybook.lrf\n"
+"\n"
+"\n"
+"Pokaż/edytuj metadane w pliku LRF.\n"
+"\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:40
@@ -1030,20 +1322,22 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:44
 msgid "The category this book belongs to. E.g.: History"
-msgstr ""
+msgstr "Kategoria do jakiej należy tak książka np.: Historia"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
 msgid "Path to a graphic that will be set as this files' thumbnail"
-msgstr ""
+msgstr "Ściezka do grafiki, ktĆ³ra ma być miniaturką tego pliku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
 msgstr ""
+"Ścieżka do pliku TXT zawierającego komentarz, ktĆ³ry ma zostać zapisany w "
+"pliku LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
 msgid "Extract thumbnail from LRF file"
-msgstr ""
+msgstr "Wypakuj miniaturkę z pliku LRF"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid ""
@@ -1057,7 +1351,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 msgid "Don't know what this is for"
-msgstr ""
+msgstr "Nie wiem do czego to służy"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
 msgid ""
@@ -1092,11 +1386,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
 msgid "Be more verbose."
-msgstr ""
+msgstr "Wyświetlaj szczegĆ³Å‚owe kominukaty."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
 msgid "You must specify a single PDF file."
-msgstr ""
+msgstr "Musisz określić pojedyńczy plik PDF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
 msgid ""
@@ -1132,19 +1426,19 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Tytuł"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
-msgstr "Autor(zy)"
+msgstr "Autor(rzy)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
 msgid "Producer"
@@ -1161,25 +1455,25 @@ msgstr "Kategoria"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Komentarze"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Etykiety"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Seria"
@@ -1188,25 +1482,25 @@ msgstr "Seria"
 msgid "Language"
 msgstr "Język"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
-msgstr ""
+msgstr "Lista etykiet do ustawienia odzielonych przecinkiem"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
-msgstr ""
+msgstr "Seria do ktĆ³rej należy książka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
-msgstr ""
+msgstr "Spis serii"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
-msgstr ""
+msgstr "Język książki"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
-msgstr ""
+msgstr "Wypakuj okładkę"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
 msgid "Usage:"
@@ -1220,7 +1514,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:60
 msgid "No filename specified."
-msgstr ""
+msgstr "Nie określono nazwy pliku."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:97
 msgid ""
@@ -1242,11 +1536,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
 msgid "The author whose book to search for."
-msgstr ""
+msgstr "Autor, ktĆ³rego książki mają być wyszukane."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
 msgid "The title of the book to search for."
-msgstr ""
+msgstr "Tutył poszukiwane książki."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
 msgid "The publisher of the book to search for."
@@ -1257,6 +1551,8 @@ msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
+"Nie można pobrać okładki z serwera z powodu zbyt dużego obciążenia. SprĆ³buj "
+"ponownie pĆ³Åŗniej."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:48
 msgid " not found."
@@ -1265,7 +1561,7 @@ msgstr " nie znaleziono"
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:51
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:82
 msgid "LibraryThing.com server error. Try again later."
-msgstr ""
+msgstr "Błąd serwera LibraryThing.com. SprĆ³buj ponownie poÅŗniej."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
 msgid ""
@@ -1277,13 +1573,13 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:40
 msgid "Usage: %s file.lit"
-msgstr ""
+msgstr "Użycie: %s plik.lit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:50
 msgid "Cover saved to"
-msgstr ""
+msgstr "Okładka zapisana do"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1591,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,9 +1604,9 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
-msgstr ""
+msgstr "Ostatnio używane foldery"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
 msgid "Send file to storage card instead of main memory by default"
@@ -1318,11 +1614,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "The format to use when saving single files to disk"
-msgstr ""
+msgstr "Format używany do zapisu pojedynczych plikĆ³w na dysku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "Confirm before deleting"
-msgstr ""
+msgstr "PotwierdÅŗ przed usunięciem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Toolbar icon size"
@@ -1330,23 +1626,23 @@ msgstr "Wielkość ikon na paskach narzędzi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Show button labels in the toolbar"
-msgstr ""
+msgstr "Pokaż etykiety przyciskĆ³w na pasku narzędzi"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Main window geometry"
-msgstr ""
+msgstr "Struktura gÅ‚Ć³wnego okna"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Notify when a new version is available"
-msgstr ""
+msgstr "Powiadom mnie, gdy dostępna jest nowa wersja"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Use Roman numerals for series number"
-msgstr ""
+msgstr "Używaj numeracji rzymskiej do numerowania serii"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Sort tags list by popularity"
-msgstr ""
+msgstr "Sortuj etykiety według popularności"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Number of covers to show in the cover browsing mode"
@@ -1370,50 +1666,62 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
 msgid "Automatically launch content server on application startup"
-msgstr ""
+msgstr "Automatycznie włączaj serwer zawartości przy starcie aplikacji"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "Pokaż ikonę w zasobniku systemowym"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "Prześlij pobrane aktualności na urządzenie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr "Usuń książki z biblioteki po przesłaniu ich na urządzenie"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
-msgstr ""
+msgstr "Urządzenie zostało już odłączone."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
 msgid "Get device information"
-msgstr ""
+msgstr "Pobierz informacje o urządzeniach"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
 msgid "Get list of books on device"
-msgstr ""
+msgstr "Pozyskaj listę książek na urządzeniu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
 msgid "Send metadata to device"
-msgstr ""
+msgstr "Prześlij metadane do urządzenia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:144
 msgid "Upload %d books to device"
-msgstr ""
+msgstr "Prześlij %d książek na urządzenie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:159
 msgid "Delete books from device"
-msgstr ""
+msgstr "Usuń książki na urządzeniu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:174
 msgid "Download books from device"
-msgstr ""
+msgstr "Pobierz książki z urządzenia"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:184
 msgid "View book on device"
-msgstr ""
+msgstr "Zobacz ksiązki na urządzeniu"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -1421,8 +1729,8 @@ msgstr "Ścieżka"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formaty"
@@ -1436,6 +1744,7 @@ msgstr "Okno dialogowe"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1467,21 +1776,21 @@ msgstr "&Tytuł:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:90
 msgid "&Author(s):"
-msgstr ""
+msgstr "&Autor(rzy):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
 msgid "&Number of Colors:"
-msgstr ""
+msgstr "Liczba kolorĆ³w:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:398
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:548
 msgid "&Profile:"
-msgstr ""
+msgstr "&Profil:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "Disable &normalize"
-msgstr ""
+msgstr "Wyłącz normalizację"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
 msgid "Keep &aspect ratio"
@@ -1489,7 +1798,7 @@ msgstr "Zachowaj &proporcje"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Wyłącz wyostrzanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "&Landscape"
@@ -1497,7 +1806,7 @@ msgstr "Pozioma"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Don't so&rt"
-msgstr ""
+msgstr "Nie so&tuj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "&Right to left"
@@ -1511,83 +1820,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
-msgstr "OgĆ³lne"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr " - wtyczki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr "Interfejs"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "OgĆ³lne"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Interfejs"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr "Niewłaściwa ścieżka do wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr "%s nie jest właściwą ścieżką do wtyczki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr "Wybierz wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr "Wtyczka nie może zostać wyłączona"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr "Wtyczka %s nie może zostać wyłączona"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr "Dziennik błędĆ³w:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr "Dziennik dostępĆ³w:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
+msgstr "Włączanie serwera zakończone niepowodzeniem"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "Niewłaściwy rozmiar"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
-msgstr ""
+msgstr "Niewłaściwa lokalizacja bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
-msgstr ""
+msgstr "Niewłaściwa lokalizacja bazy danych "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
-msgstr ""
+msgstr "Niewłaściwa lokalizacja bazy danych.<br>Nie można zapisać do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
-msgstr ""
+msgstr "Kompaktowanie bazy danych. To może chwilę potrwać."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
-msgstr ""
+msgstr "Kompaktowanie..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Ustawienia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1973,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
-msgstr ""
+msgstr "Pokaż powiadomienie, gdy &nowa wersja jest dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
-msgstr ""
+msgstr "Wczytytuj &metadane z plikĆ³w"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
-msgstr ""
+msgstr "Format zapisu dla &pojedynczego pliku:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
-msgstr ""
+msgstr "Wybierz &język (wymaga restartu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "Normalny"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Wysoki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "Niski"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "&Priorytet zdań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
-msgstr ""
+msgstr "Używaj numeracji &rzymskiej do numerowania serii"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Pasek narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Duże"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Średnie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Małe"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
-msgstr ""
+msgstr "&Rozmiar przyciskĆ³w na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
-msgstr ""
+msgstr "Pokazuj &tekst pod przyciskami na pasku narzędzi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
-msgstr ""
+msgstr "Wybierz &kolumny pokazywane w widoku biblioteki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
+msgstr "Użyj wewnętrznej &przeglądarki do wyświetlania poniższych formatĆ³w:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "Automatycznie przesyłaj pobrane &aktualności na czytnik e-książek"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "&Usuń aktualności z biblioteki po przesłaniu ich na urządzenie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
-msgstr ""
+msgstr "&Metadane z nazwy pliku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
-msgstr ""
+msgstr "Nazwa &użytkownika:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
-msgstr ""
+msgstr "&Hasło:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
+msgstr "&Pokaż hasło"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
-msgstr ""
+msgstr "&Włącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
-msgstr ""
+msgstr "W&yłącz serwer"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,9 +2177,47 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr "Włącz/&Wyłącz wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr "&Dostosuj wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr "&Usuń wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr "Dodaj nową wtyczkę"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr "&Plik wtyczki:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr "&Dodaj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
-msgstr ""
+msgstr "BŁĄD"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:50
 msgid "Bulk convert to EPUB"
@@ -1804,16 +2225,16 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
 msgid "Convert %s to EPUB"
-msgstr ""
+msgstr "Konwertuj %s do EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
-msgstr ""
+msgstr "Metadane"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:85
@@ -1827,7 +2248,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
 msgid "Page Setup"
-msgstr ""
+msgstr "Ustawienia strony"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:87
@@ -1861,29 +2282,29 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
 msgid "Choose cover for "
-msgstr ""
+msgstr "Wybierz okładkę dla "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
-msgstr ""
+msgstr "Nie można odczytać"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
-msgstr ""
+msgstr "Błąd przy odczycie pliku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,13 +2314,13 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
-msgstr ""
+msgstr "Nie można przekonwertować"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:228
 msgid "This book has no available formats"
-msgstr ""
+msgstr "Ta książka nie ma dostepnych formatĆ³w"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
@@ -1931,30 +2352,30 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:506
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:315
 msgid "Book Cover"
-msgstr ""
+msgstr "Okładka książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
-msgstr ""
+msgstr "Zmień grafikę &okładki:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
 msgid "&Title: "
-msgstr ""
+msgstr "&Tytuł: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:376
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512
@@ -1964,14 +2385,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
-msgstr ""
+msgstr "&Autor(rzy): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,27 +2413,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
-msgstr ""
+msgstr "&Wydawca: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
-msgstr ""
+msgstr "Zmień wydawcę tej ksiązki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:295
 msgid "Ta&gs: "
-msgstr ""
+msgstr "E&tykiety: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,21 +2442,21 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
-msgstr ""
+msgstr "&Serie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:386
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
-msgstr ""
+msgstr "Lista znanych serii. Możesz dodać nowe serie."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:388
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:389
@@ -2044,13 +2465,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:304
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:305
 msgid "Series index."
-msgstr ""
+msgstr "Spis serii."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:390
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:526
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:306
 msgid "Book "
-msgstr ""
+msgstr "Książka "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:392
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:534
@@ -2060,7 +2481,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:393
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:528
 msgid "Base &font size:"
-msgstr ""
+msgstr "GÅ‚Ć³wny &rozmiar czcionki:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:394
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:400
@@ -2080,27 +2501,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:397
 msgid "Override &CSS"
-msgstr ""
+msgstr "Zastąp &CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:399
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:549
 msgid "&Left Margin:"
-msgstr ""
+msgstr "&Lewy margines:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:401
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
 msgid "&Right Margin:"
-msgstr ""
+msgstr "&Prawy margines:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:403
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:553
 msgid "&Top Margin:"
-msgstr ""
+msgstr "&GĆ³rny margines:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:405
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
 msgid "&Bottom Margin:"
-msgstr ""
+msgstr "&Dolny margines:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:407
 msgid "Automatic &chapter detection"
@@ -2170,19 +2591,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
 msgid "Cannot connect"
-msgstr ""
+msgstr "Nie można połączyć się"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
 msgid "You must specify a valid access key for isbndb.com"
-msgstr ""
+msgstr "Musisz podać właściwy klucz dostępu do isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
 msgid "Error fetching metadata"
-msgstr ""
+msgstr "Błąd podczas pobierania metadanych"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
 msgid "No metadata found"
-msgstr ""
+msgstr "Nie znaleziono metadanych"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
 msgid ""
@@ -2191,25 +2612,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
 msgid "Fetch metadata"
-msgstr ""
+msgstr "Pobierz metadane"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetching metadata for <b>%1</b>"
-msgstr ""
+msgstr "Pobierz metadane dla <b>%1</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
 "Sign up for a free account from <a "
 "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
 msgstr ""
+"Zarejestruj darmowe konto na <a "
+"href=\"http://www.isbndb.com\">ISBNdb.com</a>, aby otrzymać klucz dostępu."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
-msgstr ""
+msgstr "Klucz &dostepu:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
 msgid "Fetch"
-msgstr ""
+msgstr "Pobierz"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
 msgid "Matches"
@@ -2230,15 +2653,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
 msgid " - Jobs"
-msgstr ""
+msgstr " - Zadania"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
 msgid "Active Jobs"
-msgstr ""
+msgstr "Aktywne zadanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
 msgid "&Stop selected job"
-msgstr ""
+msgstr "&Zatrzymaj zaznaczone zadanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
 msgid "Choose the format to convert into LRF"
@@ -2246,7 +2669,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
 msgid "Convert %s to LRF"
-msgstr ""
+msgstr "Konwertuj %s do LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:347
@@ -2272,6 +2695,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
 msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
 msgstr ""
+"<li><b>book-designer</b> - pliki HTML0 stworzone w Book Designer</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 msgid ""
@@ -2331,27 +2755,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:535
 msgid "Minimum &indent:"
-msgstr ""
+msgstr "Minimalne &wcięcie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:537
 msgid "&Word spacing:"
-msgstr ""
+msgstr "Odstęp pomiędzy &słowami:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
 msgid "Enable auto &rotation of images"
-msgstr ""
+msgstr "Włącz auto&rotację obrazkĆ³w"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
 msgid "Insert &blank lines between paragraphs"
-msgstr ""
+msgstr "Wstaw &puste linie pomiędzy paragrafami"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
 msgid "Ignore &tables"
-msgstr ""
+msgstr "Ignoruj &tabele"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:542
 msgid "Ignore &colors"
-msgstr ""
+msgstr "Ignoruj &kolory"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:543
 msgid "&Preprocess:"
@@ -2359,19 +2783,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:544
 msgid "Header"
-msgstr ""
+msgstr "NagÅ‚Ć³wek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:545
 msgid "&Show header"
-msgstr ""
+msgstr "&Pokaż nagÅ‚Ć³wek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:546
 msgid "&Header format:"
-msgstr ""
+msgstr "&Format nagÅ‚Ć³wka:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:547
 msgid "Override<br>CSS"
-msgstr ""
+msgstr "Zastąp<br>CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:552
@@ -2384,11 +2808,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
 msgid "&Convert tables to images (good for large/complex tables)"
-msgstr ""
+msgstr "&Konwertuj tabele do obrazkĆ³w (zalecane dla dużych/złożonych tabel)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:558
 msgid "&Multiplier for text size in rendered tables:"
-msgstr ""
+msgstr "&Mnożnik dla tekstu w wyrenderowanych tableach:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:559
 msgid "Title based detection"
@@ -2444,101 +2868,108 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
-msgid "Edit Meta information"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
-msgid "Meta information"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+msgid "Edit Meta information"
+msgstr "Edytuj metadane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
+msgid "Meta information"
+msgstr "Metadane"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
-msgstr ""
+msgstr "&Ocena:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
-msgstr ""
+msgstr "Ocena tej książki. 0-5 gwiazdek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
-msgstr ""
+msgstr " gwiazdek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
-msgstr ""
+msgstr "Dodaj &etykiety: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
-msgstr ""
+msgstr "OtwĆ³rz edytor etykiet"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
-msgstr ""
+msgstr "&Usuń etykiety:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
+msgstr "Usuń &format:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
+"<p>Wpisz nazwę użytkownika i hasło dla <b>LibraryThing.com</b>. <br/>Jeśli "
+"nie posiadasz jeszcze konta, możesz się <a "
+"href='http://www.librarything.com'>zarejestrować</a> za darmo!.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
-msgstr ""
+msgstr "<b>Nie można pobrać okładki.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
-msgstr ""
+msgstr "Nie można pobrać okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
-msgstr ""
+msgstr "Nie można pobrać okładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:277
 msgid "Edit Meta Information"
-msgstr ""
+msgstr "Edytuj metadane"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:281
 msgid "Swap the author and title"
-msgstr ""
+msgstr "Zamień autora z tytułem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:287
 msgid ""
@@ -2548,34 +2979,35 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:302
 msgid "Remove unused series (Series that have no books)"
 msgstr ""
+"Usuń nieużywane serie (serie, ktĆ³re są nie przypisane do żadnej książki)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:307
 msgid "IS&BN:"
-msgstr ""
+msgstr "IS&BN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:309
 msgid "Fetch metadata from server"
-msgstr ""
+msgstr "Pobierz metadane z serwera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:310
 msgid "Available Formats"
-msgstr ""
+msgstr "Dostępne formaty"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:311
 msgid "Add a new format for this book to the database"
-msgstr ""
+msgstr "Dodaj nowy format tej książki do bazy danych."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:313
 msgid "Remove the selected formats for this book from the database."
-msgstr ""
+msgstr "Usuń zaznaczone formaty tej ksiązki z bazy danych."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:319
 msgid "Reset cover to default"
-msgstr ""
+msgstr "PrzywrĆ³Ä‡ domyślną okładkę"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:321
 msgid "Fetch cover image from server"
-msgstr ""
+msgstr "Pobierz okładkę z serwera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:322
 msgid ""
@@ -2584,101 +3016,123 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:323
 msgid "Change password"
-msgstr ""
+msgstr "Zmień hasło"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
-msgstr ""
+msgstr "Wymagane hasło"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr "Ty"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr "%d ÅŗrĆ³deł"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr "Stworzone przez: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
-msgstr ""
+msgstr "Ostatnio pobrano: %s dni temu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
-msgid "Schedule news download"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
-msgid "Add a custom news source"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
-msgid "News"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
-msgid "Recipes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
-msgid "Schedule for download"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
-msgid "title"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
-msgid "description"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
-msgid "&Schedule for download every:"
-msgstr ""
+msgstr "Ostatnio pobrano: nigdy"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+msgid "Schedule news download"
+msgstr "Zaplanuj pobieranie aktualności"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
+msgid "Add a custom news source"
+msgstr "Dodaj własne ÅŗrĆ³dło aktualności"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
+msgid "News"
+msgstr "Aktualności"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
+msgid "Recipes"
+msgstr "ŹrĆ³dła"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+msgid "Schedule for download"
+msgstr "Planowanie pobierania"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+msgid "title"
+msgstr "tytuł"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+msgid "description"
+msgstr "opis"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr "autor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+msgid "&Schedule for download every:"
+msgstr "&Zaplanuj pobieranie co:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
-msgstr ""
+msgstr " dni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
-msgstr ""
+msgstr "&Konto"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
+"Aby zaplanowane działania były wykonywane, musisz zostawić włączone calibre."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
-msgstr ""
+msgstr "&Pobierz teraz"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
+"Usuń pobrane aktualności starsze niż podana liczba dni. Ustaw zero, aby "
+"wyłączyć usuwanie."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
-msgstr ""
+msgstr "Usuń pobrane aktualności starsze niż "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
@@ -2687,7 +3141,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
-msgstr ""
+msgstr "zawiera"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
 msgid "The text to search for. It is interpreted as a regular expression."
@@ -2705,67 +3159,71 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:87
 msgid "Advanced Search"
-msgstr ""
+msgstr "Zaawansowane wyszukiwanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
 msgid "Find entries that have..."
-msgstr ""
+msgstr "ZnajdÅŗ wpisy zawierające..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:89
 msgid "&All these words:"
-msgstr ""
+msgstr "&Wszystkie te słowa:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:90
 msgid "This exact &phrase:"
-msgstr ""
+msgstr "Dokładnie tą &frazę:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:91
 msgid "&One or more of these words:"
-msgstr ""
+msgstr "&Jedno lub więcej z tych sÅ‚Ć³w:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:92
 msgid "But dont show entries that have..."
-msgstr ""
+msgstr "Ale nie pokazuj wpisĆ³w zawierających..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:93
 msgid "Any of these &unwanted words:"
-msgstr ""
+msgstr "KtĆ³rekolwiek z &niechcianych sÅ‚Ć³w:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:94
 msgid ""
 "See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
 "search-interface\">User Manual</a> for more help"
 msgstr ""
+"OtwĆ³rz <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
+"search-interface\">Podręcznik Użytkownika</a> aby uzyskać więcej informacji"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
-msgstr ""
+msgstr "Edytor etykiet"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
-msgstr ""
+msgstr "&Dostępne etykiety"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
 msgid ""
 "Delete tag from database. This will unapply the tag from all books and then "
 "remove it from the database."
 msgstr ""
+"Usuń etykietę z bazy danych. To działanie usunie tą etykietę ze wszystkich "
+"książek i usunie ją z bazy danych."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
-msgstr ""
+msgstr "Przypisz etykietę do tej książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
-msgstr ""
+msgstr "&Przypisane etykiety"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
-msgstr ""
+msgstr "Usuń etykietę z tej książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
-msgstr ""
+msgstr "Dodaj etykietę:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
 msgid ""
@@ -2775,11 +3233,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
 msgid "Add tag to available tags and apply it to current book"
-msgstr ""
+msgstr "Dodaj etykietę do dostępnych etykiet i przypisz ją do tej książki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:63
 msgid "No recipe selected"
-msgstr ""
+msgstr "Nie zaznaczono ÅŗrĆ³dła"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
 msgid "The attached file: %s is a recipe to download %s."
@@ -2793,7 +3251,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:221
 msgid "Switch to Advanced mode"
-msgstr ""
+msgstr "Przełącz na zaawansowany tryb"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:100
@@ -2826,25 +3284,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,37 +3314,37 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:214
 msgid "Add custom news source"
-msgstr ""
+msgstr "Dodaj własne ÅŗrĆ³dło aktualności"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:215
 msgid "Available user recipes"
-msgstr ""
+msgstr "Dostępne ÅŗrĆ³dła użytkownika"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:216
 msgid "Add/Update &recipe"
-msgstr ""
+msgstr "&Dodaj/Uaktualnij ÅŗrĆ³dło"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:217
 msgid "&Remove recipe"
-msgstr ""
+msgstr "&Usuń ÅŗrĆ³dło"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:218
 msgid "&Share recipe"
-msgstr ""
+msgstr "&Przekaż ÅŗrĆ³dło"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:219
 msgid "Customize &builtin recipe"
-msgstr ""
+msgstr "Dostosuj jedno z &domyślnych ÅŗrĆ³deł"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:220
 msgid "&Load recipe from file"
-msgstr ""
+msgstr "&Wczytaj ÅŗrĆ³dło z pliku"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:222
 msgid ""
@@ -2904,11 +3362,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:226
 msgid "Recipe &title:"
-msgstr ""
+msgstr "&Tytuł ÅŗrĆ³dła:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:227
 msgid "&Oldest article:"
-msgstr ""
+msgstr "&Najstarszy artykuł może mieć:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:228
 msgid "The oldest article to download"
@@ -2991,7 +3449,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
 msgid "File &name:"
-msgstr ""
+msgstr "&Nazwa pliku:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
 msgid "Test"
@@ -3020,7 +3478,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111
 msgid "Authors:"
-msgstr ""
+msgstr "Autorzy:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112
 msgid "Regular expression (?P<authors>)"
@@ -3028,7 +3486,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Series:"
-msgstr ""
+msgstr "Serie:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
 msgid "Regular expression (?P<series>)"
@@ -3036,7 +3494,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
 msgid "Series index:"
-msgstr ""
+msgstr "Spis serii:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Regular expression (?P<series_index>)"
@@ -3052,7 +3510,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:46
 msgid "Job"
-msgstr ""
+msgstr "Zadanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
 msgid "Status"
@@ -3060,23 +3518,23 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
 msgid "Progress"
-msgstr ""
+msgstr "Postęp"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:49
 msgid "Running time"
-msgstr ""
+msgstr "Czas pracy"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:65
 msgid "Unknown job"
-msgstr ""
+msgstr "Nieznane zadanie"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:70
 msgid "Finished"
-msgstr ""
+msgstr "Zakończone"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
 msgid "Error"
-msgstr ""
+msgstr "Błąd"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
 msgid "Waiting"
@@ -3086,54 +3544,65 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
-msgstr ""
+msgstr "Nie można przerwać zadania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
-msgid "Size (MB)"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
-msgid "Date"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
+msgid "Size (MB)"
+msgstr "Rozmiar (MB)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
+msgid "Date"
+msgstr "Data"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
-msgstr ""
+msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
-msgstr ""
+msgstr "Brak"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr "Książka <font face=\"serif\">%s</font> z %s."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
+"Szukaj (Aby użyć zaawansowanego wyszukiwania kliknij przycisk po lewej)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
@@ -3160,7 +3629,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3654,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3199,7 +3668,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3676,155 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
-msgid "&Restore"
-msgstr ""
+msgstr "Błąd podczas komunikacji z urządzeniem"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
-msgid "&Donate"
-msgstr ""
+msgid "&Restore"
+msgstr "&PrzywrĆ³Ä‡"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+msgid "&Donate"
+msgstr "&Wesprzyj"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
+msgstr "&Zakończ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
+"<p>Aby uzyskać pomoc odwiedÅŗ <a "
+"href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
+"<b>%s</b>: %s stworzył <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
-msgstr ""
+msgstr "i usuń z biblioteki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
-msgstr ""
+msgstr "Edytuj metadane pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
-msgstr ""
+msgstr "Dodaj książki z pojedyńczego folderu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
-msgstr ""
+msgstr "Zapisz na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
-msgstr ""
+msgstr "Zapisz na dysku w pojedyńczym folderze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
-msgstr ""
+msgstr "Zapisz na dysku jedynie pliki w formacie %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
-msgstr ""
+msgstr "Wyświetl"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
-msgstr ""
+msgstr "Wyświetl określony format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
-msgstr ""
+msgstr "Konwertuj pojedynczo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr "Podobne książki..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
-msgstr ""
+msgstr "Wybierz lokalizację dla twojej biblioteki książek."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3840,455 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
+"<p>Książki o takim samym tytule jak poniższe znajdują już się bazie danych. "
+"Dodać je mimo to?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
-msgstr ""
+msgstr "Znleziono duplikaty!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
-msgstr ""
+msgstr "Nie można edytować metadanych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
-msgstr ""
+msgstr "Nie wybrano ksiązek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr "Przesyłanie aktualności na urządzenie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
-msgstr ""
+msgstr "Nie można zapisać na dysku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
-msgstr ""
+msgstr "Wyberz folder docelowy"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
+"<p>Nie można zapisać poniższych książek na dysku, ponieważ plik w formacie "
+"%s nie jest dla nich dostępny:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
-msgstr ""
+msgstr "Nie można zapisać niektĆ³rych e-książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
-msgstr ""
+msgstr "Pobieranie aktualności z "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
-msgstr ""
+msgstr "Nie wybrano ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
-msgstr ""
+msgstr "Nie można wyświetlić"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
-msgstr ""
+msgstr "Wybierz format do wyświetlenia"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr "Nie można otworzyć folderu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
-msgstr ""
+msgstr "Nie można skonfigurować"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
-msgstr ""
+msgstr "Nie można skonfigurować, gdy są aktywne jakieś zadania."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
-msgstr ""
+msgstr "Kopiowanie biblioteki do "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
-msgstr ""
+msgstr "Błąd podczas konwersji"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
-msgstr ""
+msgstr "Wybierz nową lokalizację dla bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
+"%s został uaktualniony do wersji %s. Zobacz <a "
+"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">listę zmian i "
+"poprawek</a>. Otworzyć stronę pobierania?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
-msgstr ""
+msgstr "Aktualizacja dostępna"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Advanced search"
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
+msgid "Advanced search"
+msgstr "Zaawansowane wyszukiwanie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
-msgstr ""
+msgstr "&Szukaj:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
-msgstr ""
+msgstr "Wyczyść pasek wyszukiwania"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
-msgstr ""
+msgstr "Dopasuj ktĆ³rykolwiek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
-msgstr ""
+msgstr "Dopasuj wszystkie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
-msgstr ""
+msgstr "Sortuj według &popularności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
-msgstr ""
+msgstr "Dodaj książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
-msgstr ""
+msgstr "Usuń książki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
-msgstr ""
+msgstr "Edytuj metadane"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
-msgstr ""
+msgstr "Preślij na urządzenie"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
-msgstr ""
+msgstr "Pobierz aktualności"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
-msgstr ""
+msgstr "Konwertuj e-ksiązki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr "OtwĆ³rz folder zawierający"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr "Pokaż szczegĆ³Å‚y ksiązki"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr "Książki tego samego autora"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr "Książki z tej serii"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr "Książki tego samego wydawcy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr "Książki z takimi samymi etykietami"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,39 +4299,39 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
-msgstr ""
+msgstr "Zadań:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
-msgstr ""
+msgstr "Kliknij, aby zobaczyć listę aktywnych zadań."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
-msgstr ""
+msgstr "Kliknij, aby przeglądać książki po okładkach"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
-msgstr ""
+msgstr "Kliknij, aby przeglądać ksiązki po etykietach"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Authors"
-msgstr ""
+msgstr "Autorzy"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Publishers"
-msgstr ""
+msgstr "Wydawcy"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
@@ -3818,7 +4370,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:375
 msgid "Fetch news from "
-msgstr ""
+msgstr "Pobierz aktualności z "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
 msgid "You must set a username and password for %s"
@@ -3830,7 +4382,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
 msgid "&Font options"
-msgstr ""
+msgstr "&Opcje czcionki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
 msgid "Se&rif family:"
@@ -3854,19 +4406,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
 msgid "S&tandard font:"
-msgstr ""
+msgstr "Czcionka pods&tawowa:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:111
 msgid "Serif"
-msgstr ""
+msgstr "Szeryfowa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:112
 msgid "Sans-serif"
-msgstr ""
+msgstr "Sans-serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:113
 msgid "Monospace"
-msgstr ""
+msgstr "Maszynowa"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:114
 msgid "&User stylesheet"
@@ -3885,19 +4437,19 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:58
 msgid "Font options"
-msgstr ""
+msgstr "Opcje czcionki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The serif font family"
-msgstr ""
+msgstr "Rodzina czcionek szeryfowych"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The sans-serif font family"
-msgstr ""
+msgstr "Rodzina czcionek sans-serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font family"
-msgstr ""
+msgstr "Rodzina czcionek monospace"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font size in px"
@@ -3912,13 +4464,13 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
-msgstr ""
+msgstr "Spis treści"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
 msgid "Go to..."
-msgstr ""
+msgstr "Przejście do..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
 msgid "Position in book"
@@ -3934,144 +4486,156 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:219
 msgid "Search for text in book"
-msgstr ""
+msgstr "Szukanie tekstu w książce"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
-msgstr ""
+msgstr "Wybierz e-book"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
-msgstr ""
+msgstr "E-booki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
-msgstr ""
+msgstr "Dodaj zakładkę"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
-msgstr ""
+msgstr "Dodaj tytuł zakładki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
-msgstr ""
+msgstr "<p>Ta książka jest chroniona przez <a href=\"%s\">DRM</a>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
-msgstr ""
+msgstr "Błąd DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
-msgstr ""
+msgstr "Nie można otworzyć e-booka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
-msgstr ""
+msgstr "<b>%s</b><br/><p>%s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
-msgid "Previous page"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
-msgid "Font size larger"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
-msgid "Font size smaller"
-msgstr ""
+msgstr "Następna strona"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
-msgid "Find next"
-msgstr ""
+msgid "Previous page"
+msgstr "Poprzednia strona"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
-msgid "Copy to clipboard"
-msgstr ""
+msgid "Font size larger"
+msgstr "Większy rozmiar czcionki"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
-msgid "Preferences"
-msgstr ""
+msgid "Font size smaller"
+msgstr "Mniejszy rozmiar czcionki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
+msgid "Find next"
+msgstr "ZnajdÅŗ następny"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
+msgid "Copy to clipboard"
+msgstr "Skopiuj do schowka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
+msgid "Preferences"
+msgstr "Preferencje"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
+msgstr "Zakładka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
-msgstr ""
+msgstr "Nieprawidłowe wyrażenie regularne"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
+"Biblioteka\n"
+"%d\n"
+"książek"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
-msgstr ""
+msgstr "Kliknij, aby zobaczyć listę książek dostepnych na twoim komputerze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4663,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr "Maksymalny rozmiar wyświetlanych okładek"
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4199,6 +4767,8 @@ msgid ""
 "Add books to database even if they already exist. Comparison is done based "
 "on book titles."
 msgstr ""
+"Dodaj książki do bazy danych nawet jeśli już są w niej. PorĆ³wnanie odbywa "
+"się na podstawie tytuÅ‚Ć³w."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:316
 msgid "You must specify at least one file to add"
@@ -4215,7 +4785,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:346
 msgid "You must specify at least one book to remove"
-msgstr ""
+msgstr "Wybierz co najmniej jedną książkę do usunięcia"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:366
 msgid ""
@@ -4232,7 +4802,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:382
 msgid "ebook file must have an extension"
-msgstr ""
+msgstr "Plik e-książki musi mieć rozszerzenie"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:390
 msgid ""
@@ -4326,79 +4896,90 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
-msgstr ""
+msgstr "<p>Kopiowanie książek do %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
-msgstr ""
+msgstr "Kopiowanie <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
-msgstr ""
+msgstr "Kompaktowanie bazy danych"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
-msgstr ""
+msgstr "Hasło do biblioteki calibre. Nazwa użytkownika to "
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
+"[options]\n"
+"\n"
+"Włącz serwer zawartości calibre."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
-msgstr ""
+msgstr "Zadanie zatrzymane przez użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
-msgstr ""
+msgstr "%sUżycie%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
-msgstr ""
+msgstr "Stworzony przez "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
-msgstr ""
+msgstr "Klucz dostępu do isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
-msgstr ""
+msgstr "Ścieżka do katalogu w ktĆ³rym przechowywana jest biblioteka książek"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
-msgstr ""
+msgstr "Język wyświetlania interfejsu użytkownika"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Domyślny format wyjściowy dla konwersji e-książek"
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
+msgstr "Wczytaj metadane z plikĆ³w"
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4412,21 +4993,21 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
 msgid "Failed to negotiate SSH session: "
-msgstr ""
+msgstr "Nie udało się wynegocjować sesji SSH: "
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
-msgstr ""
+msgstr "Nieznany kanał"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
-msgstr ""
+msgstr "Artukył bez tytułu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
 msgid "Options to control the fetching of periodical content from the web."
@@ -4434,31 +5015,31 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
 msgid "Customize the download engine"
-msgstr ""
+msgstr "Dostosuj silnik pobierania"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
-msgstr ""
+msgstr "Czas oczekiwania na odpowiedÅŗ serwera. Domyślnie: %default sek."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +5047,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,9 +5057,9 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
-msgstr ""
+msgstr "Nie pobieraj arkuszy styli CSS."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:33
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:88
@@ -4493,7 +5074,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:92
 msgid "Be more verbose while processing."
-msgstr ""
+msgstr "Wyświetlaj szczegĆ³Å‚owe kominukaty w czasie pracy."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:39
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
@@ -4505,12 +5086,12 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:95
 msgid "Username for sites that require a login to access content."
-msgstr ""
+msgstr "Login dla stron wymagających zalogowania to przeglądania zawartości."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:43
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:96
 msgid "Password for sites that require a login to access content."
-msgstr ""
+msgstr "Hasło dla stron wymagających zalogowania to przeglądania zawartości."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:49
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:99
@@ -4528,12 +5109,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
 msgid "Don't show the progress bar"
-msgstr ""
+msgstr "Ukryj pasek postępu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
 msgid "Very verbose output, useful for debugging."
-msgstr ""
+msgstr "Bardzo szczegĆ³Å‚owy wynik. Przydatny do debugowania."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:57
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:107
@@ -4570,116 +5151,141 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
 msgid "Dont show the progress bar"
-msgstr ""
+msgstr "Ukryj pasek postępu"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
-msgstr ""
+msgstr "Nieznane ÅŗrĆ³dło informacji"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
-msgstr ""
+msgstr "Pobranie zakończone"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
-msgstr ""
+msgstr " z "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
-msgstr ""
+msgstr "Nie mozna pobrac artukułu. Uruchom z --debug żeby poznać powĆ³d"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
-msgstr ""
+msgstr "PrĆ³ba pobrania okładki..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
-msgstr ""
+msgstr "Nie można pobrać okładki: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
-msgstr ""
+msgstr "Pobieranie okładki z %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
-msgstr ""
+msgstr "Artykuł bez tytułu"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
+"\n"
+"Pobrano artukuł %s z %s\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
-msgstr ""
+msgstr "Artykuł pobrany: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
-msgstr ""
+msgstr "Nie udało się pobrać artukułu: %s z %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
-msgstr ""
+msgstr "Pobieranie artykułu nie powiodło się: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
+"%prog URL\n"
+"\n"
+"Gdzie URL to na przykład http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
+"Maksymalna liczba plikĆ³w do pobrania. Stosowane jedynie do plikĆ³w z etykiet "
+"<a href>. Wartość domyślna: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
+"Pokazuj szczegĆ³Å‚owową informację wyjściową. Przydatne przy debugowaniu."
+
+#~ msgid "Library"
+#~ msgstr "Biblioteka"
+
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Zapytaj o &potwierdzenie przed usunięciem plikĆ³w"
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [options] nazwa pliku\n"
+#~ "\n"
+#~ "Konwertuj dowolny format e-booka do formatu epub. Wspierane typy plikĆ³w: %s\n"
diff --git a/src/calibre/translations/pt.po b/src/calibre/translations/pt.po
index bfdcf4febd..f038b84b60 100644
--- a/src/calibre/translations/pt.po
+++ b/src/calibre/translations/pt.po
@@ -7,206 +7,30 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-07-05 03:33+0000\n"
-"Last-Translator: Tiago Silva <Unknown>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-18 18:01+0000\n"
+"Last-Translator: Fabio Malcher Miranda <mirand863@hotmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
-msgid "Unable to detect the %s disk drive. Try rebooting."
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
-msgid "The reader has no storage card connected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
-msgid "Options to control the conversion to EPUB"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
-msgid ""
-"The output EPUB file. If not specified, it is derived from the input file "
-"name."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
-msgid ""
-"Profile of the target device this EPUB is meant for. Set to None to create a "
-"device independent EPUB. The profile is used for device specific "
-"restrictions on the EPUB. Choices are: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
-msgid ""
-"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
-"existing CSS declarations in the source files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
-msgid "Control auto-detection of document structure."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
-msgid ""
-"An XPath expression to detect chapter titles. The default is to consider "
-"<h1> or\n"
-"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
-"\"part\" as chapter titles as \n"
-"well as any tags that have class=\"chapter\". \n"
-"The expression used must evaluate to a list of elements. To disable chapter "
-"detection,\n"
-"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
-"for further\n"
-"help on using this feature.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
-msgid ""
-"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
-"page breaks before chapters. A value of \"rule\" will insert a line before "
-"chapters. A value of \"none\" will disable chapter marking and a value of "
-"\"both\" will use both page breaks and lines to mark chapters."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
-msgid "Path to the cover to be used for this book"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
-msgid ""
-"Use the cover detected from the source file in preference to the specified "
-"cover."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
-msgid ""
-"Control the automatic generation of a Table of Contents. If an OPF file is "
-"detected\n"
-"and it specifies a Table of Contents, then that will be used rather than "
-"trying\n"
-"to auto-generate a Table of Contents.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
-msgid ""
-"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
-"is: %default. Links are only added to the TOC if less than the --toc-"
-"threshold number of chapters were detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
-msgid "Don't add auto-detected chapters to the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
-msgid ""
-"If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level one. If this is specified, it takes precedence over "
-"other forms of auto-detection."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level two. Each entry is added under the previous level one "
-"entry."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
-msgid ""
-"Path to a .ncx file that contains the table of contents to use for this "
-"ebook. The NCX file should contain links relative to the directory it is "
-"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
-"an overview of the NCX format."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
-msgid ""
-"Normally, if the source file already has a Table of Contents, it is used in "
-"preference to the autodetected one. With this option, the autodetected one "
-"is always used."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
-msgid "Control page layout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
-msgid "Set the top margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
-msgid "Set the bottom margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
-msgid "Set the left margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
-msgid "Set the right margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
-msgid ""
-"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
-"rescaling of fonts."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
-msgid ""
-"Remove spacing between paragraphs. Will not work if the source file forces "
-"inter-paragraph spacing."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
-msgid ""
-"Preserve the HTML tag structure while splitting large HTML files. This is "
-"only neccessary if the HTML files contain CSS that uses sibling selectors. "
-"Enabling this greatly slows down processing of large HTML files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
-msgid "Print generated OPF file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
-msgid "Print generated NCX file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
-msgid "Keep intermediate files during processing by html2epub"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
-msgid ""
-"Extract the contents of the produced EPUB file to the specified directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
@@ -219,22 +43,27 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:245
@@ -242,27 +71,340 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1392
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1423
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
 msgid "Unknown"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr "Incapaz de detectar o disco %s. Tente reinicializar"
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
+msgid "The reader has no storage card connected."
+msgstr "O leitor nĆ£o tem cartĆ£o de armazenamento conectado"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
+msgid "Options to control the conversion to EPUB"
+msgstr "OpƧƵes para controlar a conversĆ£o para EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+"O arquivo de saĆ­da EPUB. Se nĆ£o especificado, ele serĆ” herdado do nome do "
+"arquivo aberto"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+"Perfil do disco para o qual este EPUB foi especificado. Selecione nenhum "
+"para criar um EPUB diferente. Este perfil Ć© usado para especificar "
+"restriƧƵes no EPUB. As escolhas sĆ£o: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+"Ou o caminho para uma folha de estilos CSS ou raw CSS. Este CSS irĆ” "
+"substituir qualquer declaraĆ§Ć£o CSS existente nos arquivos fontes"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid "Control auto-detection of document structure."
+msgstr "Controlar auto detecĆ§Ć£o da estrutura do documento"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+"Uma expressĆ£o XPath para detectar os tĆ­tulos dos capĆ­tulos. O padrĆ£o Ć© "
+"considerar as tags <h1> ou <h2> que contĆŖm as palavras \"CapĆ­tulo\", "
+"\"livro\", \"seĆ§Ć£o\" ou \"parte\" como tĆ­tulos do capĆ­tulo bem como muitas "
+"tags tĆŖm a class=\"CapĆ­tulo\".\n"
+"A expressĆ£o usada deve calcular uma lista de elementos. Para desabilitar a "
+"detecĆ§Ć£o de capĆ­tulos, use a expressĆ£o \"/\". Veja o tutorial do XPath no "
+"manual do usuƔrio do calibre para mais ajuda sobre como usar esta "
+"caracterĆ­stica.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+"Especifique como marcar capĆ­tulos detectados. Um valor \"pagebreak\" vai "
+"inserir quebras de pƔgina antes dos capƭtulos. Um valor \"rule\" vai inserir "
+"uma linha antes dos capĆ­tulos. Um valor \"none\" vai desabilitar a marcaĆ§Ć£o "
+"do capƭtulo e um valor \"both\" irƔ usar ambos quebra de pƔgina e linhas "
+"para marcar capĆ­tulos."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+msgid "Path to the cover to be used for this book"
+msgstr "Caminho para a capa a ser usada por este livro"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the autodetected one. With this option, the autodetected one "
+"is always used."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
+msgid "Control page layout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid "Set the top margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
+msgid "Set the left margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
+msgid "Set the right margin in pts. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
+msgid ""
+"Remove spacing between paragraphs. Will not work if the source file forces "
+"inter-paragraph spacing."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
+msgid "Print generated OPF file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
+msgid "Print generated NCX file to stdout"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
+msgid "Keep intermediate files during processing by html2epub"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +415,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +434,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +533,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -437,7 +597,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr ""
 
@@ -678,11 +838,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -693,118 +853,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -845,95 +1005,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1132,17 +1292,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1161,25 +1321,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1188,23 +1348,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1283,7 +1443,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1455,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,7 +1468,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1376,6 +1536,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1411,9 +1583,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1421,8 +1593,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1436,6 +1608,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1511,83 +1684,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1837,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,6 +2041,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1811,7 +2096,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1865,25 +2150,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,7 +2178,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1934,22 +2219,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1964,14 +2249,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,14 +2277,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2012,7 +2297,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,7 +2306,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2030,8 +2315,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2444,91 +2729,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2590,93 +2879,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2826,25 +3134,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,7 +3164,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3086,52 +3394,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3160,7 +3478,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3503,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3199,7 +3517,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3525,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3686,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,29 +4138,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3912,7 +4303,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3936,109 +4327,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4047,31 +4442,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4499,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4326,79 +4730,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Criado por "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4418,13 +4830,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4437,28 +4849,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +4878,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,7 +4888,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4573,113 +4985,113 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
diff --git a/src/calibre/translations/ru.po b/src/calibre/translations/ru.po
index 3834a30142..fbe94e2969 100644
--- a/src/calibre/translations/ru.po
+++ b/src/calibre/translations/ru.po
@@ -1,212 +1,40 @@
 # Translation template file..
 # Copyright (C) 2007 Kovid Goyal
-# Kovid Goyal <kovid@kovidgoyal.net>, 2007.
 #
+# Kovid Goyal <kovid@kovidgoyal.net>, 2007, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.55\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-07-22 05:50+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2009-01-03 17:58+0000\n"
 "Last-Translator: Kovid Goyal <Unknown>\n"
-"Language-Team: ru\n"
+"Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-Language: Russian\n"
+"X-Poedit-SourceCharset: utf-8\n"
 "Generated-By: pygettext.py 1.5\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,329,-1,-1\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
-msgid "Unable to detect the %s disk drive. Try rebooting."
-msgstr "ŠŠµ уŠ“Š°Š»Š¾ŃŃŒ Š¾ŠæрŠµŠ“ŠµŠ»Šøть Š“ŠøсŠŗ %s. ŠŸŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ ŠæŠµŃ€ŠµŠ·Š°Š³Ń€ŃƒŠ·Šøться."
-
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
-msgid "The reader has no storage card connected."
-msgstr "Šš рŠøŠ“ŠµŃ€Ńƒ Š½Šµ ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° ŠŗŠ°Ń€Ń‚Š° ŠæŠ°Š¼ŃŃ‚Šø."
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
-msgid "Options to control the conversion to EPUB"
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
-msgid ""
-"The output EPUB file. If not specified, it is derived from the input file "
-"name."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
-msgid ""
-"Profile of the target device this EPUB is meant for. Set to None to create a "
-"device independent EPUB. The profile is used for device specific "
-"restrictions on the EPUB. Choices are: "
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
-msgid ""
-"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
-"existing CSS declarations in the source files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
-msgid "Control auto-detection of document structure."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
-msgid ""
-"An XPath expression to detect chapter titles. The default is to consider "
-"<h1> or\n"
-"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
-"\"part\" as chapter titles as \n"
-"well as any tags that have class=\"chapter\". \n"
-"The expression used must evaluate to a list of elements. To disable chapter "
-"detection,\n"
-"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
-"for further\n"
-"help on using this feature.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
-msgid ""
-"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
-"page breaks before chapters. A value of \"rule\" will insert a line before "
-"chapters. A value of \"none\" will disable chapter marking and a value of "
-"\"both\" will use both page breaks and lines to mark chapters."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
-msgid "Path to the cover to be used for this book"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
-msgid ""
-"Use the cover detected from the source file in preference to the specified "
-"cover."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
-msgid ""
-"Control the automatic generation of a Table of Contents. If an OPF file is "
-"detected\n"
-"and it specifies a Table of Contents, then that will be used rather than "
-"trying\n"
-"to auto-generate a Table of Contents.\n"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
-msgid ""
-"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
-"is: %default. Links are only added to the TOC if less than the --toc-"
-"threshold number of chapters were detected."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
-msgid "Don't add auto-detected chapters to the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
-msgid ""
-"If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level one. If this is specified, it takes precedence over "
-"other forms of auto-detection."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
-msgid ""
-"XPath expression that specifies all tags that should be added to the Table "
-"of Contents at level two. Each entry is added under the previous level one "
-"entry."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
-msgid ""
-"Path to a .ncx file that contains the table of contents to use for this "
-"ebook. The NCX file should contain links relative to the directory it is "
-"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
-"an overview of the NCX format."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
-msgid ""
-"Normally, if the source file already has a Table of Contents, it is used in "
-"preference to the autodetected one. With this option, the autodetected one "
-"is always used."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
-msgid "Control page layout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
-msgid "Set the top margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
-msgid "Set the bottom margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
-msgid "Set the left margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
-msgid "Set the right margin in pts. Default is %default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
-msgid ""
-"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
-"rescaling of fonts."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
-msgid ""
-"Remove spacing between paragraphs. Will not work if the source file forces "
-"inter-paragraph spacing."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
-msgid ""
-"Preserve the HTML tag structure while splitting large HTML files. This is "
-"only neccessary if the HTML files contain CSS that uses sibling selectors. "
-"Enabling this greatly slows down processing of large HTML files."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
-msgid "Print generated OPF file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
-msgid "Print generated NCX file to stdout"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
-msgid "Keep intermediate files during processing by html2epub"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
-msgid ""
-"Extract the contents of the produced EPUB file to the specified directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
@@ -219,22 +47,27 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:245
@@ -242,27 +75,366 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1392
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1423
 #: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
 msgid "Unknown"
 msgstr "ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Š¾"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr "ŠŠµ уŠ“Š°Š»Š¾ŃŃŒ Š¾ŠæрŠµŠ“ŠµŠ»Šøть Š“ŠøсŠŗ %s. ŠŸŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ ŠæŠµŃ€ŠµŠ·Š°Š³Ń€ŃƒŠ·Šøться."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
+msgid "The reader has no storage card connected."
+msgstr "ŠŠµ ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Š° ŠŗŠ°Ń€Ń‚Š° ŠæŠ°Š¼ŃŃ‚Šø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
+msgid "Options to control the conversion to EPUB"
+msgstr "ŠžŠæцŠøŠø ŠŗŠ¾Š½Ń‚Ń€Š¾Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя Š² EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+"Š’Ń‹Ń…Š¾Š“Š½Š¾Š¹ фŠ°Š¹Š» EPUB. Š•ŃŠ»Šø Š½Šµ Š½Š°Š·Š½Š°Ń‡ŠµŠ½Š¾, ŠøŠ·Š²Š»ŠµŠŗŠ°ŠµŃ‚ся ŠøŠ¼Ń Š²Ń…Š¾Š“ящŠµŠ³Š¾ фŠ°Š¹Š»Š°."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+"ŠŸŃ€Š¾Ń„ŠøŠ»ŃŒ цŠµŠ»ŠµŠ²Š¾Š³Š¾ устрŠ¾Š¹ŃŃ‚Š²Š° Š“Š»Ń ŠŗŠ¾Ń‚Š¾Ń€Š¾Š³Š¾ ŠæрŠµŠ“Š½Š°Š·Š½Š°Ń‡ŠµŠ½ этŠ¾Ń‚ EPUB. Š£ŃŃ‚Š°Š½Š¾Š²ŠøтŠµ "
+"Š² None Š“Š»Ń сŠ¾Š·Š“Š°Š½Šøя Š½ŠµŠ·Š°Š²ŠøсŠøŠ¼Š¾Š³Š¾ устрŠ¾Š¹ŃŃ‚Š²Š° EPUB. ŠŸŃ€Š¾Ń„ŠøŠ»ŃŒ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся Š“Š»Ń "
+"Š“Š»Ń устŠ°Š½Š¾Š²ŠŗŠø сŠæŠµŃ†ŠøŠ°Š»ŃŒŠ½Ń‹Ń… Š½Š°ŃŃ‚Ń€Š¾ŠµŠŗ устрŠ¾Š¹ŃŃ‚Š² Š² EPUB. Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+"Š”Ń€ŃƒŠ³Š¾Š¹ Šæуть Šŗ тŠ°Š±Š»ŠøцŠµ стŠøŠ»ŠµŠ¹ CSS  ŠøŠ»Šø Š½ŠµŠæŠ¾ŃŃ€ŠµŠ“стŠ²ŠµŠ½Š½Š¾ CSS. Š­Ń‚Š¾Ń‚ CSS Š±ŃƒŠ“ŠµŃ‚ "
+"Š·Š°Š¼ŠµŠ½ŃŃ‚ŃŒ Š»ŃŽŠ±Ń‹Šµ CSS ŠøŠ¼ŠµŃŽŃ‰ŠøŠµŃŃ Š² ŠøсхŠ¾Š“Š½Š¾Š¼ фŠ°Š¹Š»Šµ."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid "Control auto-detection of document structure."
+msgstr "ŠŸŃ€Š¾Š²ŠµŃ€ŠŗŠ° Š°Š²Ń‚Š¾Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя струŠŗтуры Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Š°."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+"Š’Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ XPath Š¾ŠæрŠµŠ“ŠµŠ»ŃŠµŃ‚ Š½Š°Š·Š²Š°Š½ŠøŠµ Š³Š»Š°Š². ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю учŠøтыŠ²Š°ŃŽŃ‚ся\n"
+"тэŠ³Šø Š½Š°Š·Š²Š°Š½Šøя Š³Š»Š°Š² <h1> ŠøŠ»Šø <h2>, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ сŠ¾Š“ŠµŃ€Š¶Š°Ń‚ сŠ»Š¾Š²Š°  \n"
+"\"chapter\",\"book\",\"section\" ŠøŠ»Šø \"part\", тŠ°Šŗ Š¶Šµ ŠŗŠ°Šŗ Šø Š“руŠ³ŠøŠµ тэŠ³Šø "
+"ŠøŠ¼ŠµŃŽŃ‰ŠøŠµ  class=\"chapter\".\n"
+"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½ŠøŠµ Š“Š°Š½Š½Š¾Š³Š¾ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøя Š“Š¾Š»Š¶Š½Š¾ Š¾ŠæрŠµŠ“ŠµŠ»Šøть сŠæŠøсŠ¾Šŗ эŠ»ŠµŠ¼ŠµŠ½Ń‚Š¾Š². Š”Š»Ń "
+"Š±Š»Š¾ŠŗŠøрŠ¾Š²Š°Š½Šøя \n"
+"Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя Š³Š»Š°Š², ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ \"/\". Š’ Š“Š°Š»ŃŒŠ½ŠµŠ¹ŃˆŠµŠ¼ сŠ¼Š¾Ń‚Ń€ŠøтŠµ  "
+"учŠµŠ±Š½ŠøŠŗ XPath \n"
+"Š² Š˜Š½ŃŃ‚Ń€ŃƒŠŗцŠøŠø ŠŸŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»Ń calibre Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя Š“Š°Š½Š½Š¾Š³Š¾ эŠ»ŠµŠ¼ŠµŠ½Ń‚Š°.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+"ŠžŠæрŠµŠ“ŠµŠ»ŃŠµŃ‚, ŠŗŠ°Šŗ ŠæŠ¾Š¼ŠµŃ‡Š°Ń‚ŃŒ Š¾ŠæрŠµŠ“ŠµŠ»ŃŠµŠ¼Ń‹Šµ Š³Š»Š°Š²Ń‹. Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ \"pagebreak\" Š±ŃƒŠ“ŠµŃ‚ "
+"Š²ŃŃ‚Š°Š²Š»ŃŃ‚ŃŒ рŠ°Š·Ń€Ń‹Š² стрŠ°Š½Šøцы ŠæŠµŃ€ŠµŠ“ Š³Š»Š°Š²Š°Š¼Šø, Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ \"rule\" - Š»ŠøŠ½Šøю. Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ "
+"\"both\" Š±ŃƒŠ“ŠµŃ‚ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š¾Š±Š° Š¼Š°Ń€ŠŗŠµŃ€Š°, Š° Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ \"none\" Š½Šµ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ "
+"рŠ°Š·Š¼ŠµŃ‚Šŗу."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+msgid "Path to the cover to be used for this book"
+msgstr "ŠŸŃƒŃ‚ŃŒ Šŗ Š¾Š±Š»Š¾Š¶ŠŗŠµ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Š¾Š¹ Š“Š»Ń этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr ""
+"Š’Š¼ŠµŃŃ‚Š¾ Š·Š°Š“Š°Š½Š½Š¾Š¹, ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ Š¾Š±Š»Š¾Š¶ŠŗŠø ŠøŠ· ŠøсхŠ¾Š“Š½Š¾Š³Š¾ фŠ°Š¹Š»Š°."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+"ŠšŠ¾Š½Ń‚Ń€Š¾Š»ŃŒ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠ¾Š³Š¾ сŠ¾Š·Š“Š°Š½Šøя ŠžŠ³Š»Š°Š²Š»ŠµŠ½Šøя. Š•ŃŠ»Šø OPF фŠ°Š¹Š» Š¾ŠæрŠµŠ“ŠµŠ»ŃŠµŃ‚\n"
+"Šø Š“ŠµŃ‚Š°Š»ŠøŠ·ŠøруŠµŃ‚ ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ, тŠ¾ Š¾Š½ Š±ŃƒŠ“ŠµŃ‚ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ сŠŗŠ¾Ń€ŠµŠµ ŠµŠ³Š¾, Š²Š¼ŠµŃŃ‚Š¾\n"
+"Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠ¾Š³Š¾ сŠ¾Š·Š“Š°Š½Šøя ŠžŠ³Š»Š°Š²Š»ŠµŠ½Šøя.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+"ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ ссыŠ»Š¾Šŗ Š²ŃŃ‚Š°Š²Š»ŠµŠ½Š½Ń‹Ń… Š² TOC. Š”Š»Ń Š±Š»Š¾ŠŗŠøрŠ¾Š²ŠŗŠø, Š²Ń‹ŃŃ‚Š°Š²ŠøтŠµ "
+"0. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default. Š•ŃŠ»Šø Š±ŃƒŠ“ŠµŃ‚ Š²ŃŃ‚Š°Š²Š»ŠµŠ½Š¾ Š² TOC  Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ ссыŠ»Š¾Šŗ "
+"Š±Š¾Š»ŃŒŃˆŠµ, чŠµŠ¼ --toc-threshold, тŠ¾ Š½ŠµŠŗŠ¾Ń‚Š¾Ń€Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ Š³Š»Š°Š² Š±ŃƒŠ“ŠµŃ‚ Š¾Š±Š½Š°Ń€ŃƒŠ¶ŠµŠ½Š½Š¾."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr "ŠŠµ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ Š°Š²Ń‚Š¾-Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š½Ń‹Šµ Š³Š»Š°Š²Ń‹ Š² ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+"Š•ŃŠ»Šø Š¼ŠµŠ½ŃŒŃˆŠµ, чŠµŠ¼ этŠ¾ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ Š³Š»Š°Š² Š¾Š±Š½Š°Ń€ŃƒŠ¶ŠµŠ½Š¾, тŠ¾ ссыŠ»ŠŗŠø Š“Š¾Š±Š°Š²Š»ŃŃŽŃ‚ся Š² "
+"ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+"XPath Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ Š“Š¾Š±Š°Š²Šøт Š²ŃŠµ Š·Š°Š“Š°Š½Š½Ń‹Šµ тэŠ³Šø Š² ŠæŠµŃ€Š²Ń‹Š¹ урŠ¾Š²ŠµŠ½ŃŒ ŠžŠ³Š»Š°Š²Š»ŠµŠ½Šøя. Š•ŃŠ»Šø "
+"Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ Š·Š°Š“Š°Š½Š¾, тŠ¾ Š¾Š½Š¾ ŠøŠ¼ŠµŠµŃ‚ ŠæрŠµŠøŠ¼ŃƒŃ‰ŠµŃŃ‚Š²Š¾ Š½Š°Š“ Š°Š²Ń‚Š¾-Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµŠ¼."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+"XPath Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ Š“Š¾Š±Š°Š²Šøт Š²ŃŠµ Š·Š°Š“Š°Š½Š½Ń‹Šµ тэŠ³Šø Š²Š¾ Š²Ń‚Š¾Ń€Š¾Š¹ урŠ¾Š²ŠµŠ½ŃŒ ŠžŠ³Š»Š°Š²Š»ŠµŠ½Šøя. "
+"ŠšŠ°Š¶Š“Š°Ń Š·Š°ŠæŠøсь Š“Š¾Š±Š°Š²Š»ŃŠµŃ‚ся ŠæŠ¾Š“ ŠæрŠµŠ“ыŠ“ущŠøŠ¹ урŠ¾Š²ŠµŠ½ŃŒ, Š¾Š“Š½Š¾Š¹ стрŠ¾ŠŗŠ¾Š¹."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+"ŠŸŃƒŃ‚ŃŒ Šŗ фŠ°Š¹Š»Ńƒ .ncx ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ сŠ¾Š“ŠµŃ€Š¶Šøт Š¾Š³Š»Š°Š²Š»ŠµŠ½ŠøŠµ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Š¾Šµ этŠ¾Š¹ ŠŗŠ½ŠøŠ³Š¾Š¹. Š¤Š°Š¹Š» "
+"NCX Š¼Š¾Š¶ŠµŃ‚ сŠ¾Š“ŠµŃ€Š¶Š°Ń‚ŃŒ ссыŠ»ŠŗŠø Š¾Ń‚Š½Š¾ŃŃŃ‰ŠøŠµŃŃ Šŗ Š“ŠøрŠµŠŗтŠ¾Ń€ŠøŠø Š² ŠŗŠ¾Ń‚Š¾Ń€Š¾Š¹ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½Š½Ń‹. "
+"Š”Š¼Š¾Ń‚Ń€Šø http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX Š¾ŠæŠøсŠ°Š½ŠøŠµ "
+"фŠ¾Ń€Š¼Š°Ń‚Š° NCX."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the autodetected one. With this option, the autodetected one "
+"is always used."
+msgstr ""
+"ŠžŠ±Ń‹Ń‡Š½Š¾, ŠµŃŠ»Šø ŠøсхŠ¾Š“Š½Ń‹Š¹ фŠ°Š¹Š» уŠ¶Šµ ŠøŠ¼ŠµŠµŃ‚ ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ, тŠ¾ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ тŠ¾Š»ŃŒŠŗŠ¾ "
+"Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø Š°Š²Ń‚Š¾-Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя. Š­Ń‚Š° Š¾ŠæцŠøя Š¾Š“Š½Š° ŠøŠ· Š²ŃŠµŠ³Š“Š° ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Ń‹Ń…."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
+msgid "Control page layout"
+msgstr "Š£ŠæрŠ°Š²Š»ŠµŠ½ŠøŠµ струŠŗтурŠ¾Š¹ стрŠ°Š½Šøцы"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid "Set the top margin in pts. Default is %default"
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š²ŠµŃ€Ń…Š½ŃŽŃŽ Š³Ń€Š°Š½Šøцу Š² тŠ¾Ń‡ŠŗŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š½ŠøŠ¶Š½ŃŽŃŽ Š³Ń€Š°Š½Šøцу Š² тŠ¾Ń‡ŠŗŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
+msgid "Set the left margin in pts. Default is %default"
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š»ŠµŠ²ŃƒŃŽ Š³Ń€Š°Š½Šøцу Š² тŠ¾Ń‡ŠŗŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
+msgid "Set the right margin in pts. Default is %default"
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть ŠæрŠ°Š²ŃƒŃŽ Š³Ń€Š°Š½Šøцу Š² тŠ¾Ń‡ŠŗŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+"ŠžŃŠ½Š¾Š²Š½Š¾Š¹ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š² тŠ¾Ń‡ŠŗŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %defaultpt.\n"
+" Š£ŃŃ‚Š°Š½Š¾Š²ŠøтŠµ 0 чтŠ¾Š±Ń‹ Š·Š°ŠæрŠµŃ‚Šøть ŠøŠ·Š¼ŠµŠ½ŠµŠ½ŠøŠµ Š¼Š°ŃŃˆŃ‚Š°Š±Š° шрŠøфтŠ°."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
+msgid ""
+"Remove spacing between paragraphs. Will not work if the source file forces "
+"inter-paragraph spacing."
+msgstr ""
+"Š£Š“Š°Š»Šøть ŠæрŠ¾Š±ŠµŠ» ŠæŠµŃ€ŠµŠ“ Š°Š±Š·Š°Ń†ŠµŠ¼. ŠŠµ Š±ŃƒŠ“ŠµŃ‚ рŠ°Š±Š¾Ń‚Š°Ń‚ŃŒ, ŠµŃŠ»Šø ŠøсхŠ¾Š“Š½Ń‹Š¹ фŠ°Š¹Š» сŠ¾Š“ŠµŃ€Š¶Šøт "
+"ŠæрŠøŠ½ŃƒŠ“ŠøтŠµŠ»ŃŒŠ½Š¾ Š·Š°Š“Š°Š½Š½Ń‹Šµ Š¼ŠµŠ¶Š°Š±Š·Š°Ń†Š½Ń‹Šµ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»Ń‹."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+"Š”Š¾Ń…Ń€Š°Š½ŃŠµŃ‚ струŠŗтуру HTML тŠµŠ³Š¾Š² ŠæŠ¾ŠŗŠ° рŠ°Š·Š“ŠµŠ»ŃŠµŃ‚ся Š±Š¾Š»ŃŒŃˆŠ¾Š¹ фŠ°Š¹Š» HTML. Š­Ń‚Š¾ "
+"Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼Š¾, ŠµŃŠ»Šø фŠ°Š¹Š» HTML сŠ¾Š“ŠµŃ€Š¶Šøт CSS ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃŽŃ‰ŠøŠ¹ Š¾Š“Š½Š¾ŃƒŃ€Š¾Š²Š½ŠµŠ²Ń‹Š¹ сŠµŠ»ŠµŠŗтŠ¾Ń€. "
+"ŠŠŗтŠøŠ²ŠøŠ·Š°Ń†Šøя Š“Š°Š½Š½Š¾Š¹ Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø, Š¾Ń‡ŠµŠ½ŃŒ сŠøŠ»ŃŒŠ½Š¾ Š·Š°Š¼ŠµŠ“Š»ŃŠµŃ‚ Š¾Š±Ń€Š°Š±Š¾Ń‚Šŗу Š±Š¾Š»ŃŒŃˆŠ¾Š³Š¾ "
+"фŠ°Š¹Š»Š° HTML."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
+msgid "Print generated OPF file to stdout"
+msgstr "Š Š°ŃŠæŠµŃ‡Š°Ń‚Š°Ń‚ŃŒ сŠ¾Š·Š“Š°Š½Š½Ń‹Š¹ фŠ°Š¹Š» OPF."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
+msgid "Print generated NCX file to stdout"
+msgstr "Š Š°ŃŠæŠµŃ‡Š°Ń‚Š°Ń‚ŃŒ сŠ¾Š·Š“Š°Š½Š½Ń‹Š¹ фŠ°Š¹Š» NCX."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
+msgid "Keep intermediate files during processing by html2epub"
+msgstr "Š”Š¾Ń…Ń€Š°Š½Šøть ŠæрŠ¾Š¼ŠµŠ¶ŃƒŃ‚Š¾Ń‡Š½ŃƒŃŽ ŠŗŠ¾ŠæŠøю фŠ°Š¹Š»Š° Š²Š¾ Š²Ń€ŠµŠ¼Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠø html2epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr "Š˜Š·Š²Š»ŠµŃ‡ŃŒ сŠ¾Š“ŠµŃ€Š¶ŠøŠ¼Š¾Šµ сŠ¾Š·Š“Š°Š½Š½Š¾Š³Š¾ фŠ°Š¹Š»Š° EPUB Š² сŠæŠµŃ†ŠøŠ°Š»ŃŒŠ½ŃƒŃŽ Š“ŠµŃ€ŠøŠŗтŠ¾Ń€Šøю."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ Š½Š°Š¹Ń‚Šø ŠŗŠ½ŠøŠ³Ńƒ Š² Š°Ń€Ń…ŠøŠ²Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -272,108 +444,130 @@ msgid ""
 "takes from\n"
 "the <spine> element of the OPF file.  \n"
 msgstr ""
+"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ фŠ°Š¹Š»Š° HTML Š² EPUB ŠŗŠ½ŠøŠ³Ńƒ. Š ŠµŠŗурсŠøŠ²Š½Š¾ Š¾Ń‚сŠ»ŠµŠ¶ŠøŠ²Š°ŠµŃ‚ Š»ŠøŠ½ŠŗŠø Š² фŠ°Š¹Š»Šµ "
+"HTML.\n"
+"Š•ŃŠ»Šø Š²Ń‹ Š·Š°Š“Š°ŠµŃ‚Šµ фŠ°Š¹Š» OPF Š²Š¼ŠµŃŃ‚Š¾ HTML, сŠæŠøсŠ¾Šŗ ссыŠ»Š¾Šŗ сŠ¾Š“ŠµŃ€Š¶Šøтся Š² эŠ»ŠµŠ¼ŠµŠ½Ń‚Šµ "
+"<spine> фŠ°Š¹Š»Š° OPF.  \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
-msgid "You must specify an input HTML file"
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
+msgid "You must specify an input HTML file"
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š·Š°Š“Š°Ń‚ŃŒ ŠøсхŠ¾Š“Š½Ń‹Š¹ фŠ°Š¹Š» HTML"
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
 msgid "%s format books are not supported"
-msgstr ""
+msgstr "%s фŠ¾Ń€Š¼Š°Ń‚ ŠŗŠ½ŠøŠ³ Š½Šµ ŠæŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŃ‚ся"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
 msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
+"ŠŠµ Š¼Š¾Š³Ńƒ Š½Š°Š¹Ń‚Šø ŠæрŠøŠµŠ¼Š»ŠøŠ¼Š¾Šµ Š¼ŠµŃŃ‚Š¾ рŠ°Š·Š“ŠµŠ»ŠµŠ½Šøя: %s Š Š°Š·Š¼ŠµŃ€ ŠæŠ¾Š“Š“ŠµŃ€ŠµŠ²Š°: %d ŠšŠ‘"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
+"\t\tŠžŃ‡ŠµŠ½ŃŒ Š¼Š½Š¾Š³Š¾ Š·Š°ŠŗŠ»Š°Š“Š¾Šŗ. ŠŸŠµŃ€ŠµŃ€Š°Š·Š±ŠµŠ¹Ń‚Šµ Š±ŠµŠ·ŃŃ‚Ń€ŃƒŠŗтурŠ½Š¾Šµ сŠ¾Ń…Ń€Š°Š½ŠµŠ½ŠøŠµ. Š­Ń‚Š¾ Š¼Š¾Š¶ŠµŃ‚ "
+"Š±Ń‹Ń‚ŃŒ ŠæрŠøчŠøŠ½Š¾Š¹ Š½ŠµŠŗŠ¾Ń€Ń€ŠµŠŗтŠ½Š¾Š³Š¾ Š²Ń‹ŠæŠ¾Š»Š½ŠµŠ½Šøя."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
-msgstr ""
+msgstr "Š—Š°ŠæŠøсыŠ²Š°ŠµŃ‚ся Š¾Š±Ń€Š°Š±Š¾Ń‚Š°Š½Š½Ń‹Š¹ HTML Š² "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
-msgstr ""
+msgstr "ŠžŠæцŠøŠø ŠŗŠ¾Š½Ń‚Ń€Š¾Š»Ń ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
-msgstr ""
+msgstr "Š’Ń‹Ń…Š¾Š“Š½Š°Ń Š“ŠµŃ€ŠøŠŗтŠ¾Ń€Šøя. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю тŠµŠŗущŠ°Ń Š“ŠµŃ€ŠøŠŗтŠ¾Ń€Šøя."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
-msgstr ""
+msgstr "ŠšŠ¾Š“ŠøрŠ¾Š²ŠŗŠ° фŠ°Š¹Š»Š° HTML. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š°Š²Ń‚Š¾Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
+"Š”Š¾Š·Š“Š°Š½ŠøŠµ Š²Ń‹Ń…Š¾Š“Š½Š¾Š³Š¾ zip фŠ°Š¹Š»Š°. Š•ŃŠ»Šø ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся этŠ° Š¾ŠæцŠøя, тŠ¾  --output ŠøŠ¼Ń "
+"фŠ°Š¹Š»Š° Š“Š¾Š»Š¶Š½Š¾ Š±Ń‹Ń‚ŃŒ Š¾Ń‚Š»ŠøчŠ½Ń‹Š¼ Š¾Ń‚ Š“ŠµŃ€ŠøŠŗтŠ¾Ń€ŠøŠø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
-msgstr ""
+msgstr "ŠšŠ¾Š½Ń‚Ń€Š¾Š»ŃŒ сŠ»ŠµŠ“Š¾Š²Š°Š½Šøя ŠæŠ¾ ссыŠ»ŠŗŠ°Š¼ Š² фŠ°Š¹Š»Šµ HTML."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
+"ŠœŠ°Ń€ŃˆŃ€ŃƒŃ‚ Š²ŠŗŠ»ŃŽŃ‡ŠµŠ½Š½Ń‹Š¹ Š² HTML ŠæрŠ¾Ń…Š¾Š“Šøтся Š² шŠøрŠøŠ½Ńƒ. ŠžŠ±Ń‹Ń‡Š½Š¾, этŠ¾ ŠæрŠ¾Ń…Š¾Š“Šøтся "
+"ŠæрŠµŠøŠ¼ŃƒŃ‰ŠµŃŃ‚Š²ŠµŠ½Š½Š¾ Š² Š³Š»ŃƒŠ±ŠøŠ½Ńƒ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
-msgid "Set metadata of the generated ebook"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
-msgid "Set the title. Default is to autodetect."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
-msgid "The author(s) of the ebook, as a comma separated list."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
-msgid "The subject(s) of this book, as a comma separated list."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
-msgid "Set the publisher of this book."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
-msgid "A summary of this book."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
-msgid "Load metadata from the specified OPF file"
-msgstr ""
+"ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ урŠ¾Š²ŠµŠ½ŃŒ рŠµŠŗурсŠøŠø, ŠµŃŠ»Šø сŠ»ŠµŠ“Š¾Š²Š°Ń‚ŃŒ ŠæŠ¾ ссыŠ»ŠŗŠ°Š¼ Š² фŠ°Š¹Š»Šµ HTML. "
+"Š”Š¾Š»Š¶Š½Š¾ Š±Ń‹Ń‚ŃŒ Š½Šµ Š¾Ń‚Ń€ŠøцŠ°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¼. 0 ŠæŠ¾Š“рŠ°Š·ŃƒŠ¼ŠµŠ²Š°ŠµŃ‚ Š½ŠµŃ‚ ссыŠ»Š¾Šŗ Š“Š»Ń сŠ»ŠµŠ“Š¾Š²Š°Š½Šøя Š² "
+"ŠŗŠ¾Ń€Š½ŠµŠ²Š¾Š¼ фŠ°Š¹Š»Šµ HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
-msgid "Options useful for debugging"
-msgstr ""
+msgid "Set metadata of the generated ebook"
+msgstr "Š’Š²ŠµŃŃ‚Šø сŠ¾Š·Š“Š°Š½Š½Ń‹Šµ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ эŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+msgid "Set the title. Default is to autodetect."
+msgstr "Š’Š²ŠµŃŃ‚Šø Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š°Š²Ń‚Š¾Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+msgid "The author(s) of the ebook, as a comma separated list."
+msgstr "ŠŠ²Ń‚Š¾Ń€(ы) ŠŗŠ½ŠøŠ³Šø, сŠæŠøсŠ¾Šŗ рŠ°Š·Š“ŠµŠ»ŃŠµŃ‚ся Š·Š°ŠæятыŠ¼Šø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
+msgid "The subject(s) of this book, as a comma separated list."
+msgstr "Š”Š¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ ŠŗŠ½ŠøŠ³Šø, сŠæŠøсŠ¾Šŗ рŠ°Š·Š“ŠµŠ»ŃŠµŃ‚ся Š·Š°ŠæятыŠ¼Šø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
+msgid "Set the publisher of this book."
+msgstr "Š’Š²ŠµŃŃ‚Šø ŠøŠ·Š“Š°Ń‚ŠµŠ»ŃŒŃŃ‚Š²Š¾ этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+msgid "A summary of this book."
+msgstr "ŠšŃ€Š°Ń‚ŠŗŠ¾Šµ ŠøŠ·Š»Š¾Š¶ŠµŠ½ŠøŠµ этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
+msgid "Load metadata from the specified OPF file"
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ ŠøŠ· ŠæŠ¾Š“рŠ¾Š±Š½Š¾Š³Š¾ OPF фŠ°Š¹Š»Š°."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
+msgid "Options useful for debugging"
+msgstr "ŠžŠæцŠøŠø ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Ń‹Šµ Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
+"Š”Š¾Š±Š°Š²Šøть Š±Š¾Š»ŃŒŃˆŠµ Š“ŠµŃ‚Š°Š»ŠøŠ·Š°Ń†ŠøŠø Š²Š¾ Š²Ń€ŠµŠ¼Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠø. ŠœŠ¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ  Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š¾ ŠæутŠµŠ¼ "
+"уŠ²ŠµŠ»ŠøчŠµŠ½Šøя Š²Ń€ŠµŠ¼ŠµŠ½Šø ŠæŠ¾Š²Ń‹ŃˆŠµŠ½Šøя Š“ŠµŃ‚Š°Š»ŠøŠ·Š°Ń†ŠøŠø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
+"Š’Ń‹Ń…Š¾Š“Š½Š¾Š¹ HTML \"струŠŗтурŠ½Š°Ń рŠ°ŃŠæŠµŃ‡Š°Ń‚ŠŗŠ°\" Š“Š»Ń ŠæрŠ¾ŃŃ‚Š¾Š³Š¾ чŠµŠ»Š¾Š²ŠµŃ‡ŠµŃŠŗŠ¾Š³Š¾ Š°Š½Š°Š»ŠøŠ·Š°"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -385,46 +579,70 @@ msgid ""
 "element\n"
 "is used.\n"
 msgstr ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Š”Š»ŠµŠ“Š¾Š²Š°Ń‚ŃŒ ŠæŠ¾ Š²ŃŠµŠ¼ ссыŠ»ŠŗŠ°Š¼ Š² фŠ°Š¹Š»Šµ HTML Šø сŠ¾Š±Ń€Š°Ń‚ŃŒ Š·Š°Ń‚ŠµŠ¼ Š² сŠæŠµŃ†ŠøŠ°Š»ŃŒŠ½Š¾Š¹ "
+"Š“ŠµŃ€ŠµŠŗтŠ¾Ń€ŠøŠø.\n"
+"Š¢Š°Šŗ Š¶Šµ сŠ¾Š±ŠøрŠ°ŠµŃ‚ся Š“руŠ³ŠøŠµ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‰ŠøŠµ рŠµŃŃƒŃ€ŃŃ‹ тŠ°ŠŗŠøŠµ ŠŗŠ°Šŗ: ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø, "
+"тŠ°Š±Š»Šøцы стŠøŠ»ŠµŠ¹, сŠŗрŠøŠæты Šø Šæр.\n"
+"Š•ŃŠ»Šø Š²Š¼ŠµŃŃ‚Š¾ уŠŗŠ·Š°Š½ OPF фŠ°Š¹Š», сŠæŠøсŠ¾Šŗ фŠ°Š¹Š»Š¾Š² Š½Š°Ń…Š¾Š“Šøтся Š² эŠ»ŠµŠ¼ŠµŠ½Ń‚Šµ <spine>.\n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr "%prog [options] LITFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr "Š’Ń‹Ń…Š¾Š“Š½Š°Ń Š“ŠøрŠµŠŗтŠ¾Ń€Šøя. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю тŠµŠŗущŠ°Ń Š“ŠøрŠµŠŗтŠ¾Ń€Šøя."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+"Š£Š“Š¾Š±Š¾Ń‡ŠøтŠ°ŠµŠ¼Ń‹Š¹ фŠ¾Ń€Š¼Š°Ń‚ ŠøŠ·Š²Š»ŠµŠŗŠ°ŠµŠ¼Š¾Š¹ рŠ°Š·Š¼ŠµŃ‚ŠŗŠø. Š’Š¾Š·Š¼Š¾Š¶Š½Š¾ Š¼Š¾Š“ŠøфŠøцŠøрŠ¾Š²Š°Ń‚ŃŒ ŠæрŠ¾Š±ŠµŠ»Š°Š¼Šø "
+"ŠøŠ¼ŠµŃŽŃ‰ŠøŠ¼Šø сŠ¼Ń‹ŃŠ»."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
+msgid "OEB ebook created in"
+msgstr "OEB ŠŗŠ½ŠøŠ³Š° сŠ¾Š·Š“Š°Š½Š° Š²"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
-msgid "OEB ebook created in"
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
-msgstr "Š£ŠŗŠ°Š¶ŠøтŠµ Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: ŠøŠ¼Ń фŠ°Š¹Š»Š°."
+msgstr "Š’Š²ŠµŠ“ŠøтŠµ Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: ŠøŠ¼Ń фŠ°Š¹Š»Š°."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
 msgid ""
 "Set the author(s). Multiple authors should be set as a comma separated list. "
 "Default: %default"
 msgstr ""
+"Š’Š²ŠµŠ“ŠøтŠµ Š°Š²Ń‚Š¾Ń€Š°(Š¾Š²). ŠŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ Š°Š²Ń‚Š¾Ń€Š¾Š² Š¼Š¾Š³ŃƒŃ‚ Š±Ń‹Ń‚ŃŒ уŠŗŠ°Š·Š°Š½Ń‹ Š² сŠæŠøсŠŗŠµ "
+"рŠ°Š·Š“ŠµŠ»ŠµŠ½Š½Ń‹Š¼ Š·Š°ŠæятыŠ¼Šø. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
 msgid "Set the comment."
-msgstr "Š£ŠŗŠ°Š¶ŠøтŠµ ŠŗŠ¾Š¼Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠ¹."
+msgstr "Š’Š²ŠµŠ“ŠøтŠµ ŠŗŠ¾Š¼Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠ¹."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
 msgid "Set the category"
-msgstr ""
+msgstr "Š’Š²ŠµŠ“ŠøтŠµ Š¶Š°Š½Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
 msgid "Sort key for the title"
@@ -437,7 +655,7 @@ msgstr "Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ Š“Š»Ń сŠ¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠø ŠæŠ¾ Š°Š²Ń‚Š¾Ń€Ńƒ"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Š˜Š·Š“Š°Ń‚ŠµŠ»ŃŒ"
 
@@ -450,21 +668,21 @@ msgid ""
 "If there is a cover graphic detected in the source file, use that instead of "
 "the specified cover."
 msgstr ""
-"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠµ Š¾Š±Š»Š¾Š¶ŠŗŠø, Š½Š°Š¹Š“ŠµŠ½Š½Š¾Šµ Š² ŠøсхŠ¾Š“Š½Š¾Š¼ фŠ°Š¹Š»Šµ, Š²Š¼ŠµŃŃ‚Š¾ "
-"уŠŗŠ°Š·Š°Š½Š½Š¾Š³Š¾."
+"Š’Š¼ŠµŃŃ‚Š¾ уŠŗŠ°Š·Š°Š½Š½Š¾Š¹ Š¾Š±Š»Š¾Š¶ŠŗŠø, ŠµŃŠ»Šø Š¾Š±Š½Š°Ń€ŃƒŠ¶ŠµŠ½Š¾ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠµ Š¾Š±Š»Š¾Š¶ŠŗŠø Š² ŠøсхŠ¾Š“Š½Š¾Š¼ "
+"фŠ°Š¹Š»Šµ, ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠµŠ³Š¾."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:94
 msgid "Output file name. Default is derived from input filename"
 msgstr ""
-"Š’Ń‹Ń…Š¾Š“Š½Š¾Šµ ŠøŠ¼Ń фŠ°Š¹Š»Š°. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š±ŃƒŠ“ŠµŃ‚ Š¾Š±Ń€Š°Š·Š¾Š²Š°Š½Š¾ ŠøŠ· ŠøŠ¼ŠµŠ½Šø Š²Ń…Š¾Š“Š½Š¾Š³Š¾ фŠ°Š¹Š»Š°"
+"Š’Ń‹Ń…Š¾Š“Š½Š¾Šµ ŠøŠ¼Ń фŠ°Š¹Š»Š°. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š±ŃƒŠ“ŠµŃ‚ Š¾Š±Ń€Š°Š·Š¾Š²Š°Š½Š¾ ŠøŠ· ŠøŠ¼ŠµŠ½Šø ŠøсхŠ¾Š“Š½Š¾Š³Š¾ фŠ°Š¹Š»Š°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
 msgid ""
 "Render HTML tables as blocks of text instead of actual tables. This is "
 "neccessary if the HTML contains very large or complex tables."
 msgstr ""
-"ŠžŃ‚Š¾Š±Ń€Š°Š¶Š°Ń‚ŃŒ HTML-тŠ°Š±Š»Šøцы ŠŗŠ°Šŗ Š±Š»Š¾ŠŗŠø тŠµŠŗстŠ°, Š° Š½Šµ ŠŗŠ°Šŗ тŠ°Š±Š»Šøцы. ŠœŠ¾Š¶Š½Š¾ этŠ¾ "
-"ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ, ŠµŃŠ»Šø HTML сŠ¾Š“ŠµŃ€Š¶Šøт сŠ»ŠøшŠŗŠ¾Š¼ Š±Š¾Š»ŃŒŃˆŠøŠµ тŠ°Š±Š»Šøцы."
+"ŠžŃ‚Š¾Š±Ń€Š°Š¶Š°Ń‚ŃŒ тŠ°Š±Š»Šøцы HTML ŠŗŠ°Šŗ Š±Š»Š¾ŠŗŠø тŠµŠŗстŠ°, Š° Š½Šµ ŠŗŠ°Šŗ тŠ°Š±Š»Šøцы. Š­Ń‚Š¾ Š½ŠµŠ¾Š±Ń…Š“ŠøŠ¼Š¾ "
+"ŠµŃŠ»Šø HTML сŠ¾Š“ŠµŃ€Š¶Šøт сŠ»ŠøшŠŗŠ¾Š¼ Š±Š¾Š»ŃŒŃˆŠøŠµ  ŠøŠ»Šø сŠ»Š¾Š¶Š½Ń‹Šµ тŠ°Š±Š»Šøцы."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:99
 msgid ""
@@ -472,28 +690,27 @@ msgid ""
 "option obsoletes the --font-delta option and takes precedence over it. To "
 "use --font-delta, set this to 0. Default: %defaultpt"
 msgstr ""
-"Š£ŠŗŠ°Š¶ŠøтŠµ Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š² ŠæуŠ½ŠŗтŠ°Ń…. Š’сŠµ шрŠøфты Š±ŃƒŠ“ут Š¾Ń‚Š¼Š°ŃŃˆŃ‚Š°Š±ŠøрŠ¾Š²Š°Š½Ń‹ "
-"ŠæŠ¾ Š½ŠµŠ¼Ńƒ. Š­Ń‚Š° Š¾ŠæцŠøя Š“ŠµŠ»Š°ŠµŃ‚ устŠ°Ń€ŠµŠ²ŃˆŠµŠ¹ Š¾ŠæцŠøю --font-delta Šø ŠøŠ¼ŠµŠµŃ‚ ŠæрŠøŠ¾Ń€ŠøтŠµŃ‚ "
-"Š½Š°Š“ Š½ŠµŠ¹. Š£ŃŃ‚Š°Š½Š¾Š²ŠøтŠµ ŠµŠµ Š² 0, чтŠ¾Š±Ń‹ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ --font-delta. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: "
-"%default ŠæуŠ½ŠŗтŠ¾Š²"
+"Š£ŠŗŠ°Š¶ŠøтŠµ Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š² ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»Š°Ń…. Š’сŠµ шрŠøфты Š±ŃƒŠ“ут "
+"Š¾Ń‚Š¼Š°ŃŃˆŃ‚Š°Š±ŠøрŠ¾Š²Š°Š½Ń‹ ŠæŠ¾ Š½ŠµŠ¼Ńƒ. Š­Ń‚Š¾Ń‚ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ ŠæŠµŃ€ŠµŠŗрыŠ²Š°ŠµŃ‚ Š¾ŠæцŠøю --font-delta Šø "
+"ŠøŠ¼ŠµŠµŃ‚ ŠæрŠøŠ¾Ń€ŠøтŠµŃ‚ Š½Š°Š“ Š½ŠµŠ¹. Š”Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя --font-delta, устŠ°Š½Š¾Š²ŠøтŠµ рŠ°Š·Š¼ŠµŃ€ "
+"шрŠøфтŠ° 0. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»(Š¾Š²)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
 msgid "Enable autorotation of images that are wider than the screen width."
 msgstr ""
-"Š Š°Š·Ń€ŠµŃˆŠøть Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠøŠ¹ рŠ°Š·Š²Š¾Ń€Š¾Ń‚ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠ¹, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ Š½Šµ уŠ¼ŠµŃ‰Š°ŃŽŃ‚ся Š½Š° "
-"эŠŗрŠ°Š½Šµ ŠæŠ¾ шŠøрŠøŠ½Šµ."
+"Š Š°Š·Ń€ŠµŃˆŠøть Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠøŠ¹ рŠ°Š·Š²Š¾Ń€Š¾Ń‚ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠ¹ ŠµŃŠ»Šø Š¾Š½Š¾ шŠøрŠµ рŠ°Š·Š¼ŠµŃ€Š° эŠŗрŠ°Š½Š°."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:104
 msgid "Set the space between words in pts. Default is %default"
-msgstr "Š£ŠŗŠ°Š¶ŠøтŠµ Š¾Ń‚ŃŃ‚ŃƒŠæ Š¼ŠµŠ¶Š“у сŠ»Š¾Š²Š°Š¼Šø Š² ŠæуŠ½ŠŗтŠ°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
+msgstr "Š£ŠŗŠ°Š¶ŠøтŠµ Š¾Ń‚ŃŃ‚ŃƒŠæ Š¼ŠµŠ¶Š“у сŠ»Š¾Š²Š°Š¼Šø Š² ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»Š°Ń…. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
 msgid "Separate paragraphs by blank lines."
-msgstr "Š”ŠµŠ»Š°Ń‚ŃŒ ŠæрŠ¾ŃŃ‚Ń€Š°Š½ŃŃ‚Š²Š° Š¼ŠµŠ¶Š“у Š°Š±Š·Š°Ń†Š°Š¼Šø."
+msgstr "Š Š°Š·Š“ŠµŠ»Šøть Š°Š±Š·Š°Ń†Ń‹ ŠæустŠ¾Š¹ стрŠ¾ŠŗŠ¾Š¹."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
 msgid "Add a header to all the pages with title and author."
-msgstr "Š”Š¾Š±Š°Š²Šøть Š²ŠµŃ€Ń…Š½ŠøŠ¹ ŠŗŠ¾Š»Š¾Š½Ń‚ŠøтуŠ» ŠŗŠ¾ Š²ŃŠµŠ¼ стрŠ°Š½ŠøцŠ°Š¼ с Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š¼ Šø Š°Š²Ń‚Š¾Ń€Š¾Š¼"
+msgstr "Š”Š¾Š±Š°Š²Šøть Š² Š²ŠµŃ€Ń…Š½ŠøŠ¹ ŠŗŠ¾Š»Š¾Š½Ń‚ŠøтуŠ» Š½Š°Š·Š²Š°Š½ŠøŠµ Šø Š°Š²Ń‚Š¾Ń€Š° Š½Š° Š²ŃŠµŃ… стрŠ°Š½ŠøцŠ°Ń…."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
 msgid ""
@@ -517,8 +734,8 @@ msgid ""
 "the HTML files are appended to the LRF. The .opf file must be in the same "
 "directory as the base HTML file."
 msgstr ""
-"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ эŠ»ŠµŠ¼ŠµŠ½Ń‚ <spine> ŠøŠ· фŠ°Š¹Š»Š° OPF, чтŠ¾Š±Ń‹ Š¾ŠæрŠµŠ“ŠµŠ»Šøть ŠæŠ¾Ń€ŃŠ“Š¾Šŗ, Š² "
-"ŠŗŠ¾Ń‚Š¾Ń€Š¾Š¼ HTML-фŠ°Š¹Š»Ń‹ Š±ŃƒŠ“ут сŠ»ŠµŠ“Š¾Š²Š°Ń‚ŃŒ Š² LRF. Š¤Š°Š¹Š» .opf Š“Š¾Š»Š¶ŠµŠ½ Š±Ń‹Ń‚ŃŒ Š² тŠ¾Š¹ Š¶Šµ "
+"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ эŠ»ŠµŠ¼ŠµŠ½Ń‚ <spine> ŠøŠ· фŠ°Š¹Š»Š° OPF Š“Š»Ń Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя Š¾Ń‡ŠµŃ€ŠµŠ“Š½Š¾ŃŃ‚Šø Š² "
+"ŠŗŠ¾Ń‚Š¾Ń€Š¾Š¼ HTML-фŠ°Š¹Š»Ń‹ Š±ŃƒŠ“ут Š“Š¾Š±Š°Š²Š»ŠµŠ½Ń‹ Š² LRF. Š¤Š°Š¹Š» .opf Š“Š¾Š»Š¶ŠµŠ½ Š±Ń‹Ń‚ŃŒ Š² тŠ¾Š¹ Š¶Šµ "
 "Š“ŠøрŠµŠŗтŠ¾Ń€ŠøŠø, чтŠ¾ Šø Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ HTML-фŠ°Š¹Š»."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
@@ -526,7 +743,7 @@ msgid ""
 "Minimum paragraph indent (the indent of the first line of a paragraph) in "
 "pts. Default: %default"
 msgstr ""
-"ŠœŠøŠ½ŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ Š¾Ń‚ŃŃ‚ŃƒŠæ Š°Š±Š·Š°Ń†Š° (Š¾Ń‚ŃŃ‚ŃƒŠæ ŠæŠµŃ€Š²Š¾Š¹ стрŠ¾ŠŗŠø Š°Š±Š·Š°Ń†Š°) Š² ŠæуŠ½ŠŗтŠ°Ń…. ŠŸŠ¾ "
+"ŠœŠøŠ½ŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ Š¾Ń‚ŃŃ‚ŃƒŠæ Š°Š±Š·Š°Ń†Š° (Š¾Ń‚ŃŃ‚ŃƒŠæ ŠæŠµŃ€Š²Š¾Š¹ стрŠ¾ŠŗŠø Š°Š±Š·Š°Ń†Š°) Š² ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»Š°Ń…. ŠŸŠ¾ "
 "уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
@@ -535,8 +752,8 @@ msgid ""
 "FONT_DELTA pts. FONT_DELTA can be a fraction.If FONT_DELTA is negative, the "
 "font size is decreased."
 msgstr ""
-"Š£Š²ŠµŠ»ŠøчŠøть рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š½Š° 2 * FONT_DELTA ŠæуŠ½ŠŗтŠ¾Š² Šø Š¼ŠµŠ¶ŃŃ‚Ń€Š¾Ń‡Š½Ń‹Š¹ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š» Š½Š° "
-"FONT_DELTA ŠæуŠ½ŠŗтŠ¾Š². Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ FONT_DELTA Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ Š“рŠ¾Š±Š½Ń‹Š¼. Š•ŃŠ»Šø FONT_DELTA "
+"Š£Š²ŠµŠ»ŠøчŠøть рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š½Š° 2 * FONT_DELTA ŠøŠ½Ń‚ŠµŃ€Š²Š°Š»Š° Šø Š¼ŠµŠ¶ŃŃ‚Ń€Š¾Ń‡Š½Ń‹Š¹ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š» "
+"Š½Š° FONT_DELTA. Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ FONT_DELTA Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ Š“рŠ¾Š±Š½Ń‹Š¼. Š•ŃŠ»Šø FONT_DELTA "
 "уŠŗŠ°Š·Š°Š½Š¾ Š¾Ń‚Ń€ŠøцŠ°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¼, тŠ¾ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Š±ŃƒŠ“ŠµŃ‚ уŠ¼ŠµŠ½ŃŒŃˆŠµŠ½."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:123
@@ -578,7 +795,7 @@ msgid ""
 "Render tables in the HTML as images (useful if the document has large or "
 "complex tables)"
 msgstr ""
-"ŠŸŃ€ŠµŠ“стŠ°Š²Š»ŃŃ‚ŃŒ тŠ°Š±Š»Šøцы Š² HTML ŠŗŠ°Šŗ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя (Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ ŠæŠ¾Š»ŠµŠ·Š½Ń‹Š¼, ŠµŃŠ»Šø Š² "
+"ŠŸŃ€ŠµŠ“стŠ°Š²Šøть тŠ°Š±Š»Šøцы Š² HTML ŠŗŠ°Šŗ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя (Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ ŠæŠ¾Š»ŠµŠ·Š½Ń‹Š¼, ŠµŃŠ»Šø Š² "
 "Š“Š¾ŠŗуŠ¼ŠµŠ½Ń‚Šµ сŠ¾Š“ŠµŃ€Š¶Š°Ń‚ся Š±Š¾Š»ŃŒŃˆŠøŠµ ŠøŠ»Šø сŠ»Š¾Š¶Š½Ń‹Šµ тŠ°Š±Š»Šøцы)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
@@ -609,7 +826,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
 msgid "Don't add links to the table of contents."
-msgstr "ŠŠµ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ ссыŠ»Š¾Šŗ Š² сŠ¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ."
+msgstr "ŠŠµ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ ссыŠ»ŠŗŠø Š² сŠ¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
 msgid "Prevent the automatic detection chapters."
@@ -620,9 +837,8 @@ msgid ""
 "The regular expression used to detect chapter titles. It is searched for in "
 "heading tags (h1-h6). Defaults to %default"
 msgstr ""
-"Š ŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ, ŠŗŠ¾Ń‚Š¾Ń€Š¾Šµ Š±ŃƒŠ“ŠµŃ‚ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Š¾ Š“Š»Ń Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² "
-"Š³Š»Š°Š². Š˜Š½Š°Ń‡Šµ Š±ŃƒŠ“ут ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Ń‹ тŠµŠ³Šø Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² (h1-h6). ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: "
-"%default"
+"Š ŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ, ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Š¾Šµ Š“Š»Ń Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя Š½Š°Š·Š²Š°Š½Šøя Š³Š»Š°Š². Š˜Ń‰ŃƒŃ‚ся "
+"тŠµŠ³Šø Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² (h1-h6). ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:168
 msgid ""
@@ -633,6 +849,12 @@ msgid ""
 "attribute to \"none\" to match only on tag names. So for example, to match "
 "all h2 tags, you would use \"h2,none,\". Default is %default"
 msgstr ""
+"ŠžŠæрŠµŠ“ŠµŠ»Šøть Š½Š°Ń‡Š°Š»ŃŒŠ½ŃƒŃŽ Š³Š»Š°Š²Ńƒ, ŠŗŠ°Šŗ ŠµŠ»ŠµŠ¼ŠµŠ½Ń‚ ŠøŠ¼ŠµŃŽŃ‰ŠøŠ¹ сŠæŠµŃ†ŠøŠ°Š»ŃŒŠ½Ń‹Šµ Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Ń‹. Š¤Š¾Ń€Š¼Š°Ń‚ "
+"Š¾ŠæцŠøŠø, этŠ¾ tagname regexp,attribute name,attribute value regexp. Š”Š»Ń ŠæрŠøŠ¼ŠµŃ€Š° "
+"сŠ¾ŠæŠ¾ŃŃ‚Š°Š²Š»ŠµŠ½Šøя Š²ŃŠµŃ… Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² тэŠ³Š¾Š² с ŠøŠ¼ŠµŃŽŃ‰ŠøŠ¼ŃŃ Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Š¾Š¼ class=\"chapter\" "
+"ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ \"h\\d,class,chapter\". Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ устŠ°Š½Š¾Š²Šøть Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚ \"none\" "
+"сŠ¾ŠæŠ¾ŃŃ‚Š°Š²ŠøŠ² тŠ¾Š»ŃŒŠŗŠ¾ Š½Š° ŠøŠ¼Ń тэŠ³Š°. Š¢Š°Šŗ Š“Š»Ń ŠæрŠøŠ¼ŠµŃ€Š°, сŠ¾ŠæŠ¾ŃŃ‚Š°Š²Šøть Š²ŃŠµ тŠµŠ³Šø h2 Š²Ń‹ "
+"Š¼Š¾Š¶ŠµŃ‚Šµ ŠŗŠ°Šŗ \"h2,none,\". ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:170
 msgid ""
@@ -644,20 +866,20 @@ msgid ""
 "turn performance of the LRF. Thus this option is ignored if the current page "
 "has only a few elements."
 msgstr ""
-"Š•ŃŠ»Šø html2lrf Š½Šµ Š½Š°Š¹Š“ŠµŃ‚ рŠ°Š·Ń€Ń‹Š²Š¾Š² стрŠ°Š½Šøц Š² фŠ°Š¹Š»Šµ html Šø Š½Šµ сŠ¼Š¾Š¶ŠµŃ‚ Š¾ŠæрŠµŠ“ŠµŠ»Šøть "
-"Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠø Š³Š»Š°Š², тŠ¾ рŠ°Š·Ń€Ń‹Š²Ń‹ стрŠ°Š½Šøц Š±ŃƒŠ“ут Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø Š“Š¾Š±Š°Š²Š»ŠµŠ½Ń‹ Š“Š¾ тŠµŠ³Š¾Š², "
-"ŠøŠ¼ŠµŠ½Š° ŠŗŠ¾Ń‚Š¾Ń€Ń‹Ń… Š±ŃƒŠ“ут сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²Š¾Š²Š°Ń‚ŃŒ этŠ¾Š¼Ńƒ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю. ŠŸŠ¾ "
-"уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default. Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ Š¾Ń‚ŠŗŠ»ŃŽŃ‡Šøть этŠ¾, уŠŗŠ°Š·Š°Š² Š² ŠŗŠ°Ń‡ŠµŃŃ‚Š²Šµ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š³Š¾ "
-"Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøя \"$\". ŠŠ°Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ этŠ¾Š¹ Š¾ŠæцŠøŠø ā€” ŠøŠ·Š±Š°Š²Šøться Š¾Ń‚ Š¾Ń‡ŠµŠ½ŃŒ Š±Š¾Š»ŃŒŃˆŠøх "
-"стрŠ°Š½Šøц, т.Šŗ. этŠ¾ уŠ¼ŠµŠ½ŃŒŃˆŠ°ŠµŃ‚ сŠŗŠ¾Ń€Š¾ŃŃ‚ŃŒ ŠæŠµŃ€ŠµŠ»ŠøстыŠ²Š°Š½Šøя стрŠ°Š½Šøц Š² LRF. Š¢Š°ŠŗŠøŠ¼ "
-"Š¾Š±Ń€Š°Š·Š¾Š¼ этŠ° Š¾ŠæцŠøя ŠøŠ³Š½Š¾Ń€ŠøруŠµŃ‚ся, ŠµŃŠ»Šø Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š½Š°Ń стрŠ°Š½ŠøцŠ° сŠ¾ŃŃ‚Š¾Šøт Š»Šøшь ŠøŠ· "
+"Š•ŃŠ»Šø html2lrf Š½Šµ Š½Š°Š¹Š“ŠµŃ‚ рŠ°Š·Ń€Ń‹Š²Š¾Š² стрŠ°Š½Šøц Š² фŠ°Š¹Š»Šµ html Šø Š½Šµ Š¾ŠæрŠµŠ“ŠµŠ»Šøт "
+"Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠø Š³Š»Š°Š², тŠ¾ ŠæŠµŃ€ŠµŠ“ тŠµŠ³Š°Š¼Šø Š±ŃƒŠ“ŠµŃ‚ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø Š²ŃŃ‚Š°Š²Š»ŃŃ‚ся рŠ°Š·Ń€Ń‹Š² "
+"стрŠ°Š½Šøц, Š½Š°Š·Š²Š°Š½ŠøŠµ ŠŗŠ¾Ń‚Š¾Ń€Š¾Š³Š¾ Š±ŃƒŠ“ŠµŃ‚ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²Š¾Š²Š°Ń‚ŃŒ этŠ¾Š¼Ńƒ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ "
+"Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default. Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ Š¾Ń‚ŠŗŠ»ŃŽŃ‡Šøть эту Š¾ŠæцŠøю, уŠŗŠ°Š·Š°Š² Š² "
+"ŠŗŠ°Ń‡ŠµŃŃ‚Š²Šµ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š³Š¾ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøя \"$\". ŠŠ°Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ этŠ¾Š¹ Š¾ŠæцŠøŠø ā€” ŠøŠ·Š±Š°Š²Šøться Š¾Ń‚ "
+"Š¾Ń‡ŠµŠ½ŃŒ Š±Š¾Š»ŃŒŃˆŠøх стрŠ°Š½Šøц, т.Šŗ. этŠ¾ уŠ¼ŠµŠ½ŃŒŃˆŠ°ŠµŃ‚ сŠŗŠ¾Ń€Š¾ŃŃ‚ŃŒ ŠæŠµŃ€ŠµŠ»ŠøстыŠ²Š°Š½Šøя стрŠ°Š½Šøц Š² "
+"LRF. Š­Ń‚Š° Š¾ŠæцŠøя ŠøŠ³Š½Š¾Ń€ŠøруŠµŃ‚ся, ŠµŃŠ»Šø Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š½Š°Ń стрŠ°Š½ŠøцŠ° сŠ¾ŃŃ‚Š¾Šøт Š»Šøшь ŠøŠ· "
 "Š½ŠµŃŠŗŠ¾Š»ŃŒŠŗŠøх эŠ»ŠµŠ¼ŠµŠ½Ń‚Š¾Š²."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:180
 msgid ""
 "Force a page break before tags whose names match this regular expression."
 msgstr ""
-"Š£ŃŃ‚Š°Š½Š°Š²Š»ŠøŠ²Š°Ń‚ŃŒ рŠ°Š·Ń€Ń‹Š²Ń‹ стрŠ°Š½Šøц ŠæŠ¾ŃŠ»Šµ тŠµŠ³Š¾Š², ŠøŠ¼ŠµŠ½Š° ŠŗŠ¾Ń‚Š¾Ń€Ń‹Ń… сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‚ этŠ¾Š¼Ńƒ "
+"Š£ŃŃ‚Š°Š½Š°Š²Šøть рŠ°Š·Ń€Ń‹Š²Ń‹ стрŠ°Š½Šøц ŠæŠµŃ€ŠµŠ“ тŠµŠ³Š°Š¼Šø, ŠøŠ¼ŠµŠ½Š° ŠŗŠ¾Ń‚Š¾Ń€Ń‹Ń… сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‚ этŠ¾Š¼Ńƒ "
 "рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:182
@@ -667,14 +889,19 @@ msgid ""
 "regexp. For example to match all heading tags that have the attribute "
 "class=\"chapter\" you would use \"h\\d,class,chapter\". Default is %default"
 msgstr ""
+"ŠŸŃ€ŠøŠ½ŃƒŠ“ŠøтŠµŠ»ŃŒŠ½Ń‹Š¹ рŠ°Š·Ń€Ń‹Š² стрŠ°Š½Šøцы ŠæŠµŃ€ŠµŠ“ эŠ»ŠµŠ¼ŠµŠ½Ń‚Š¾Š¼ ŠøŠ¼ŠµŃŽŃ‰ŠøŠ¼Šø сŠæŠµŃ†ŠøŠ°Š»ŃŒŠ½Ń‹Š¹ Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚. "
+"Š¤Š¾Ń€Š¼Š°Ń‚ Š¾ŠæцŠøŠø, этŠ¾ tagname regexp,attribute name,attribute value regexp. Š”Š»Ń "
+"ŠæрŠøŠ¼ŠµŃ€Š° сŠ¾ŠæŠ¾ŃŃ‚Š°Š²Š»ŠµŠ½Šøя Š²ŃŠµŃ… Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² тэŠ³Š¾Š² с ŠøŠ¼ŠµŃŽŃ‰ŠøŠ¼ŃŃ Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Š¾Š¼ "
+"class=\"chapter\" ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ \"h\\d,class,chapter\". ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю %default"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:185
 msgid "Add detected chapters to the table of contents."
-msgstr "Š”Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ Š½Š°Š¹Š“ŠµŠ½Š½Ń‹Šµ Š³Š»Š°Š²Ń‹ Š² сŠ¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ."
+msgstr "Š”Š¾Š±Š°Š²Šøть Š½Š°Š¹Š“ŠµŠ½Š½Ń‹Šµ Š³Š»Š°Š²Ń‹ Š² сŠ¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:188
 msgid "Preprocess Baen HTML files to improve generated LRF."
-msgstr "ŠžŠ±Ń€Š°Š±Š¾Ń‚ŠŗŠ° фŠ°Š¹Š»Š¾Š² Baen HTML Š“Š»Ń уŠ»ŃƒŃ‡ŃˆŠµŠ½Šøя Š³ŠµŠ½ŠµŃ€ŠøруŠµŠ¼Š¾Š³Š¾ LRF."
+msgstr ""
+"ŠŸŃ€ŠµŠ“Š²Š°Ń€ŠøтŠµŠ»ŃŒŠ½Š°Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠ° фŠ°Š¹Š»Š¾Š² Baen HTML Š“Š»Ń уŠ»ŃƒŃ‡ŃˆŠµŠ½Šøя сŠ¾Š·Š“Š°Š²Š°ŠµŠ¼Š¾Š³Š¾ LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:190
 msgid ""
@@ -703,31 +930,31 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:203
 msgid "The serif family of fonts to embed"
-msgstr ""
+msgstr "Serif сŠµŠ¼ŠµŠ¹ŃŃ‚Š²Š¾ шрŠøфтŠ¾Š² Š²ŃŃ‚Š°Š²Š»ŠµŠ½Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:206
 msgid "The sans-serif family of fonts to embed"
-msgstr ""
+msgstr "Sans-serif сŠµŠ¼ŠµŠ¹ŃŃ‚Š²Š¾ шрŠøфтŠ¾Š² Š²ŃŃ‚Š°Š²Š»ŠµŠ½Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:209
 msgid "The monospace family of fonts to embed"
-msgstr "ŠŠ°Š±Š¾Ń€ шрŠøфтŠ¾Š² сŠµŃ€ŠøŠø \"monospace\" Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя"
+msgstr "ŠŠ°Š±Š¾Ń€ шрŠøфтŠ¾Š² Š“Š»Ń ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøя сŠµŃ€ŠøŠø \"monospace\""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
 msgid "Be verbose while processing"
-msgstr "ŠžŃ‚Š¾Š±Ń€Š°Š¶Š°Ń‚ŃŒ ŠøŠ·Š±Ń‹Ń‚Š¾Ń‡Š½ŃƒŃŽ ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю ŠæрŠø Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠµ"
+msgstr "ŠŸŠ¾Š“рŠ¾Š±Š½Š°Ń ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøя ŠæрŠø Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:215
 msgid "Convert to LRS"
-msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ Š² LRF"
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ Š² LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
 msgid ""
 "Minimize memory usage at the cost of longer processing times. Use this "
 "option if you are on a memory constrained machine."
 msgstr ""
-"Š£Š¼ŠµŠ½ŃŒŃˆŠøть ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½ŠøŠµ ŠæŠ°Š¼ŃŃ‚Šø цŠµŠ½Š¾Š¹ Š±Š¾Š»ŃŒŃˆŠµŠ³Š¾ Š²Ń€ŠµŠ¼ŠµŠ½Šø Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠø. Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ "
-"эту Š¾ŠæцŠøю, ŠµŃŠ»Šø Š½Š° ŠŗŠ¾Š¼ŠæьютŠµŃ€Šµ Š¾Š³Ń€Š°Š½ŠøчŠµŠ½Š° ŠæŠ°Š¼ŃŃ‚ŃŒ."
+"Š£Š¼ŠµŠ½ŃŒŃˆŠøть ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½ŠøŠµ ŠæŠ°Š¼ŃŃ‚Šø, уŠ²ŠµŠ»ŠøчŠøŠ² Š²Ń€ŠµŠ¼Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠø. Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ эту "
+"Š¾ŠæцŠøю, ŠµŃŠ»Šø Š½Š° ŠŗŠ¾Š¼ŠæьютŠµŃ€Šµ Š¾Š³Ń€Š°Š½ŠøчŠµŠ½Š° ŠæŠ°Š¼ŃŃ‚ŃŒ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
 msgid ""
@@ -742,11 +969,11 @@ msgstr ""
 "рŠ°ŃŠæрŠ¾ŃŃ‚Ń€Š°Š½ŠµŠ½Š½Ń‹Š¹ Š²Š°Ń€ŠøŠ°Š½Ń‚ ā€” utf-8. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š±ŃƒŠ“ŠµŃ‚ сŠ“ŠµŠ»Š°Š½Š° ŠæŠ¾ŠæытŠŗŠ° уŠ³Š°Š“Š°Ń‚ŃŒ "
 "ŠŗŠ¾Š“ŠøрŠ¾Š²Šŗу."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ ŠøŠ· %s Š² LRF Š½Šµ ŠæŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŃ‚ся."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -758,127 +985,155 @@ msgid ""
 msgstr ""
 "any2lrf [Š¾ŠæцŠøŠø] myfile\n"
 "\n"
-"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ эŠ»ŠµŠŗтрŠ¾Š½Š½Ń‹Šµ ŠŗŠ½ŠøŠ³Šø Š² рŠ°Š·Š»ŠøчŠ½Ń‹Ń… фŠ¾Ń€Š¼Š°Ń‚Š°Ń… Š² LRF. ŠŸŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŠ¼Ń‹Šµ "
-"фŠ¾Ń€Š¼Š°Ń‚Ń‹:\n"
+"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Ń‹Š²Š°ŠµŃ‚ эŠ»ŠµŠŗтрŠ¾Š½Š½Ń‹Šµ ŠŗŠ½ŠøŠ³Šø ŠøŠ· рŠ°Š·Š»ŠøчŠ½Ń‹Ń… фŠ¾Ń€Š¼Š°Ń‚Š¾Š² Š² LRF. "
+"ŠŸŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŠ¼Ń‹Šµ фŠ¾Ń€Š¼Š°Ń‚Ń‹:\n"
 "LIT, RTF, TXT, HTML, EPUB, MOBI, PRC Šø PDF. any2lrf тŠ°ŠŗŠ¶Šµ Š¼Š¾Š¶ŠµŃ‚ Š¾Š±Ń€Š°Š±Š¾Ń‚Š°Ń‚ŃŒ "
 "Š°Ń€Ń…ŠøŠ²Ń‹ RAR ŠøŠ»Šø\n"
 "ZIP, ŠæытŠ°ŃŃŃŒ Š¾Š±Š½Š°Ń€ŃƒŠ¶Šøть эŠ»ŠµŠŗтрŠ¾Š½Š½ŃƒŃŽ ŠŗŠ½ŠøŠ³Ńƒ Š² Š°Ń€Ń…ŠøŠ²Šµ.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "ŠŠµ уŠŗŠ°Š·Š°Š½ фŠ°Š¹Š» Š“Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
-msgid "Rendered %s"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
-msgid "Failed %s"
-msgstr ""
+msgid "Rendered %s"
+msgstr "ŠžŠ±Ń€Š°Š±Š¾Ń‚Š°Š½Š¾ %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
+msgid "Failed %s"
+msgstr "Š”Š±Š¾Š¹ %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
+"ŠžŃˆŠøŠ±ŠŗŠ° ŠæрŠ¾Ń†ŠµŃŃŠ° с ŠŗŠ¾Š¼ŠøŠŗсŠ°Š¼Šø: %s\n"
+"\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
+"ŠžŠæцŠøŠø ŠŗŠ¾Š½Ń‚Ń€Š¾Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя фŠ°Š¹Š»Š¾Š² ŠŗŠ¾Š¼ŠøŠŗсŠ¾Š² (CBR, CBZ) Š² эŠ»ŠµŠŗтрŠ¾Š½Š½ŃƒŃŽ ŠŗŠ½ŠøŠ³Ńƒ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
+msgstr "Š—Š°Š³Š¾Š»Š¾Š²Š¾Šŗ Š“Š»Ń сŠ¾Š·Š“Š°Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся ŠøŠ¼Ń фŠ°Š¹Š»Š°."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+"Š’Š²ŠµŃŃ‚Šø Š°Š²Ń‚Š¾Ń€Š° Š² Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ сŠ¾Š·Š“Š°Š²Š°ŠµŠ¼Ń‹Šµ эŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Š¾Š¹. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю "
+"%default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
+"ŠŸŃƒŃ‚ŃŒ Š“Š»Ń сŠ¾Š·Š“Š°Š²Š°ŠµŠ¼Š¾Š³Š¾ фŠ°Š¹Š»Š°. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю фŠ°Š¹Š» сŠ¾Š·Š“Š°ŠµŃ‚ся Š² тŠµŠŗущŠµŠ¹ "
+"Š“ŠµŃ€Ń€ŠøŠŗтŠ¾Ń€ŠøŠø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
+"ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ цŠ²ŠµŃ‚Š° Š“Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠø ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя Š² Š¾Ń‚Ń‚ŠµŠ½ŠŗŠø сŠµŃ€Š¾Š³Š¾. ŠŸŠ¾ "
+"уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
+"ŠžŃ‚Š¼ŠµŠ½Šøть Š½Š¾Ń€Š¼Š°Š»ŠøŠ·Š°Ń†Šøю (ŠæŠ¾Š²Ń‹ŃˆŠµŠ½ŠøŠµ ŠŗŠ¾Š½Ń‚Ń€Š°ŃŃ‚Š°) цŠ²ŠµŃ‚Š¾Š²Š¾Š³Š¾ Š“ŠøŠ°ŠæŠ°Š·Š¾Š½Š° Š“Š»Ń "
+"ŠŗŠ°Ń€Ń‚ŠøŠ½Š¾Šŗ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
-msgstr ""
+msgstr "Š—Š°Š“Š°Ń‚ŃŒ фŠ¾Ń€Š¼Š°Ń‚ ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š½Š° Š²ŠµŃŃŒ эŠŗрŠ°Š½."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
-msgstr ""
+msgstr "ŠžŃ‚Š¼ŠµŠ½Šøть ŠæŠ¾Š²Ń‹ŃˆŠµŠ½ŠøŠµ рŠµŠ·ŠŗŠ¾ŃŃ‚Šø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
-msgstr ""
+msgstr "ŠŠµ рŠ°Š·Š“ŠµŠ»ŃŃ‚ŃŒ Š°Š»ŃŒŠ±Š¾Š¼Š½ŃƒŃŽ ŠŗŠ°Ń€Ń‚ŠøŠ½Šŗу Š½Š° Š“Š²Šµ ŠæŠ¾Ń€Ń‚Ń€ŠµŃ‚Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
+"Š”Š¾Ń…Ń€Š°Š½Šøть фŠ¾Ń€Š¼Š°Ń‚ ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø Šø Š¼Š°ŃŃˆŃ‚Š°Š± ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃ Š²Ń‹ŃŠ¾Ń‚Ńƒ эŠŗрŠ°Š½Š°, ŠŗŠ°Šŗ шŠøрŠøŠ½Ńƒ Š“Š»Ń "
+"ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° Š² Š°Š»ŃŒŠ±Š¾Š¼Š½Š¾Š¼ рŠµŠ¶ŠøŠ¼Šµ."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
+"Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся Š“Š»Ń ŠæуŠ±Š»ŠøŠŗŠ°Ń†ŠøŠ¹ сŠæрŠ°Š²Š° Š½Š°Š»ŠµŠ²Š¾ тŠ°ŠŗŠøх, ŠŗŠ°Šŗ Š¼Š°Š½Š³Š° (яŠæŠ¾Š½ŃŠŗŠøŠµ "
+"ŠŗŠ¾Š¼ŠøŠŗсы). ŠŠ»ŃŒŠ±Š¾Š¼Š½Ń‹Šµ стрŠ°Š½Šøцы рŠ°Š·Š“ŠµŠ»ŃŃŽŃ‚ся Š½Š° ŠæŠ¾Ń€Ń‚Ń€ŠµŃ‚Š½Ń‹Šµ сŠæрŠ°Š²Š° Š½Š°Š»ŠµŠ²Š¾."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
+"Š Š°Š·Ń€ŠµŃˆŠøть ŠæŠ¾Š“чŠøстŠŗу. Š£Š¼ŠµŠ½ŃŒŃˆŠ°ŠµŃ‚ ŠæятŠ½ŠøстыŠ¹ шуŠ¼. ŠœŠ¾Š¶ŠµŃ‚ Š·Š½Š°Ń‡ŠøтŠµŠ»ŃŒŠ½Š¾ уŠ²ŠµŠ»ŠøчŠøть "
+"Š²Ń€ŠµŠ¼Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
+"ŠŠµ сŠ¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒ фŠ°Š¹Š»Ń‹ Š²Ń…Š¾Š“ящŠøŠµ Š² ŠŗŠ¾Š¼ŠøŠŗсы Š² Š°Š»Ń„Š°Š²ŠøтŠ½Š¾Š¼ ŠæŠ¾Ń€ŃŠ“ŠŗŠµ ŠæŠ¾ ŠøŠ¼ŠµŠ½Šø. "
+"Š’Š¼ŠµŃŃ‚Š¾ этŠ¾Š³Š¾ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠæŠ¾Ń€ŃŠ“Š¾Šŗ, Š“Š¾Š±Š°Š²Š»ŠµŠ½Š½Ń‹Š¹ Š² ŠŗŠ¾Š¼ŠøŠŗсы."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
+"Š’Ń‹Š±Ń€Š°Ń‚ŃŒ ŠæрŠ¾Ń„Š°Š¹Š» устрŠ¾Š¹ŃŃ‚Š²Š° Š“Š»Ń ŠŗŠ¾Ń‚Š¾Ń€Š¾Š³Š¾ Š²Ń‹ ŠæрŠµŠ¾Š±Ń€Š°Š·ŃƒŠµŃ‚Šµ фŠ°Š¹Š». ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю "
+"SONY PRS-500 ŠøŠ¼ŠµŠµŃ‚ рŠ°Š·Š¼ŠµŃ€ эŠŗрŠ°Š½Š° 584x754 ŠæŠøŠŗсŠµŠ»ŠµŠ¹. Š­Ń‚Š¾ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŠµŃ‚ Š¼Š½Š¾Š³ŠøŠ¼ "
+"рŠøŠ“ŠµŃ€Š°Š¼ с тŠ°ŠŗŠøŠ¼ Š¶Šµ рŠ°Š·Ń€ŠµŃˆŠµŠ½ŠøŠµŠ¼ эŠŗрŠ°Š½Š°."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
+"Š”ŠµŃ‚Š°Š»ŠøŠ·Š°Ń†Šøя, ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Š°Ń Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø. ŠœŠ¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ устŠ°Š½Š¾Š²Š»ŠµŠ½Š¾ Š¼Š½Š¾Š³Š¾ŠŗрŠ°Ń‚Š½Š¾Šµ "
+"Š²Ń€ŠµŠ¼Ń Š“Š»Ń Š»ŃƒŃ‡ŃˆŠµŠ¹ Š“ŠµŃ‚Š°Š»ŠøŠ·Š°Ń†ŠøŠø."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
-msgstr ""
+msgstr "ŠŠµ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ стрŠ¾Šŗу сŠ¾ŃŃ‚Š¾ŃŠ½Šøя."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
+"%prog [options] comic.cb[z|r]\n"
+"\n"
+"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ ŠŗŠ¾Š¼ŠøŠŗсŠ¾Š² ŠøŠ· фŠ°Š¹Š»Š¾Š² CBZ ŠøŠ»Šø CBR Š² эŠ»ŠµŠŗтрŠ¾Š½Š½ŃƒŃŽ ŠŗŠ½ŠøŠ³Ńƒ. \n"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
-msgstr ""
+msgstr "Š ŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚ Š·Š°ŠæŠøсыŠ²Š°ŠµŃ‚ся Š²"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
-msgstr ""
+msgstr "ŠžŃ‚Š¾Š±Ń€Š°Š¶Š°ŃŽŃ‚ся стрŠ°Š½Šøцы ŠŗŠ¾Š¼ŠøŠŗсŠ¾Š²..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
 msgid ""
@@ -887,7 +1142,7 @@ msgid ""
 "        \n"
 "%prog converts mybook.epub to mybook.lrf"
 msgstr ""
-"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½ŠøŠµ: %prog [Š¾ŠæцŠøŠø] mybook.epub\n"
+"Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ: %prog [Š¾ŠæцŠøŠø] mybook.epub\n"
 "\n"
 "\n"
 "%prog ŠæрŠµŠ¾Š±Ń€Š°Š·ŃƒŠµŃ‚ mybook.epub Š² mybook.lrf"
@@ -907,113 +1162,120 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
 msgid "Print generated HTML to stdout and quit."
-msgstr "Š Š°ŃŠæŠµŃ‡Š°Ń‚Š°Ń‚ŃŒ сŠ³ŠµŠ½ŠµŃ€ŠøрŠ¾Š²Š°Š½Š½Ń‹Š¹ HTML Š² stdout Šø Š²Ń‹Š¹Ń‚Šø."
+msgstr "ŠŠ°ŠæŠµŃ‡Š°Ń‚Š°Ń‚ŃŒ сŠ³ŠµŠ½ŠµŃ€ŠøрŠ¾Š²Š°Š½Š½Ń‹Š¹ HTML Šø Š²Ń‹Š¹Ń‚Šø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
 msgid "Keep generated HTML files after completing conversion to LRF."
-msgstr ""
+msgstr "Š”Š¾Ń…Ń€Š°Š½Šøть сŠ¾Š·Š“Š°Š½Š½Ń‹Š¹ фŠ°Š¹Š» HTML ŠæŠ¾ŃŠ»Šµ Š²Ń‹ŠæŠ¾Š»Š½ŠµŠ½Šøя ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя Š² LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
 msgid "Options to control the behavior of feeds2disk"
-msgstr "ŠžŠæцŠøŠø уŠæрŠ°Š²Š»ŠµŠ½Šøя ŠæŠ¾Š²ŠµŠ“ŠµŠ½ŠøŠµŠ¼ feeds2disk"
+msgstr "ŠžŠæцŠøŠø уŠæрŠ°Š²Š»ŠµŠ½Šøя ŠøŠ·Š¼ŠµŠ½ŠµŠ½ŠøяŠ¼Šø feeds2disk"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
 msgid "Options to control the behavior of html2lrf"
-msgstr "ŠžŠæцŠøŠø уŠæрŠ°Š²Š»ŠµŠ½Šøя ŠæŠ¾Š²ŠµŠ“ŠµŠ½ŠøŠµŠ¼ html2lrf"
+msgstr "ŠžŠæцŠøŠø уŠæрŠ°Š²Š»ŠµŠ½Šøя ŠøŠ·Š¼ŠµŠ½ŠµŠ½ŠøяŠ¼Šø html2lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
 msgid "Fetching of recipe failed: "
-msgstr "Š”ŠŗŠ°Ń‡ŠøŠ²Š°Š½ŠøŠµ ŠæŠ¾Š“ŠæŠ¾Ń€ŠŗŠø Š½Šµ уŠ“Š°Š»Š¾ŃŃŒ: "
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
-msgid "\tBook Designer file detected."
-msgstr "\tŠžŠæрŠµŠ“ŠµŠ»ŠµŠ½ фŠ°Š¹Š» Š² фŠ¾Ń€Š¼Š°Ń‚Šµ Book Designer."
+msgstr "ŠŠµŃƒŠ“Š°Ń‡Š½Š¾ Š²Ń‹Š±Ń€Š°Š½Š½Ń‹Š¹ Š½Š°Š±Š¾Ń€ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š² : "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+msgid "\tBook Designer file detected."
+msgstr "\tŠ¤Š°Š¹Š» Book Designer Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
-msgstr "\tŠ Š°Š·Š±Š¾Ń€ HTML..."
+msgstr "\tŠŠ½Š°Š»ŠøŠ· HTML..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
-msgstr "\tŠžŠæрŠµŠ“ŠµŠ»ŠµŠ½ фŠ°Š¹Š» Š² фŠ¾Ń€Š¼Š°Ń‚Šµ Baen. ŠŸŠ¾Š²Ń‚Š¾Ń€Š½Ń‹Š¹ рŠ°Š·Š±Š¾Ń€..."
+msgstr "\tŠ¤Š°Š¹Š» Baen Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½. ŠŸŠ¾Š²Ń‚Š¾Ń€Š½Ń‹Š¹ Š°Š½Š°Š»ŠøŠ·..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
-msgstr ""
+msgstr "Š—Š°ŠæŠøсŠ°Ń‚ŃŒ ŠæрŠµŠ“Š²Š°Ń€Ń‚ŠµŠ»ŃŒŠ½ŃƒŃŽ Š¾Š±Ń€Š°Š±Š¾Ń‚Šŗу HTML Š² "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
-msgstr "ŠžŠ±Ń€Š°Š±Š¾Ń‚ŠŗŠ° %s"
+msgstr "ŠžŠ±Ń€Š°Š±Š¾Ń‚Š°Š½Š¾ %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ Š² BBeB..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "ŠŠµ уŠ“Š°Š»Š¾ŃŃŒ рŠ°Š·Š¾Š±Ń€Š°Ń‚ŃŒ фŠ°Š¹Š»: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
-msgstr ""
+msgstr "%s ŠæустŠ¾Š¹ фŠ°Š¹Š»"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° Š°Š½Š°Š»ŠøŠ·Š° ссыŠ»ŠŗŠø %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ Š“Š¾Š±Š°Š²Šøть ссыŠ»Šŗу %s Š² TOC"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Ń‹Š¹ ŠæрŠ¾Ń†ŠµŃŃ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя %s. ŠžŃˆŠøŠ±ŠŗŠ°: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Ń‹Š¹ ŠæрŠ¾Ń†ŠµŃŃ чŠµŃ€ŠµŠ“Š¾Š²Š°Š½Šøя PNG %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
+"ŠŠµŃƒŠ“Š°Ń‡Š½Ń‹Š¹ ŠæрŠ¾Ń†ŠµŃŃ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя: %s\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
+"ŠŸŃ€ŠøŠ·Š¾ŃˆŠ»Š° Š¾ŃˆŠøŠ±ŠŗŠ° ŠæрŠø Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠµ тŠ°Š±Š»Šøцы: %s. ŠŸŃ€Š¾ŠæустŠøть рŠ°Š·Š¼ŠµŃ‚Šŗу тŠ°Š±Š»Šøцы."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
+"ŠŸŠ»Š¾Ń…Š°Ń тŠ°Š±Š»ŠøцŠ°:\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
-msgstr ""
+msgstr "Š¢Š°Š±Š»ŠøцŠ° ŠøŠ¼ŠµŠµŃ‚ Š¾Ń‡ŠµŠ½ŃŒ Š±Š¾Š»ŃŒŃˆŠøŠµ ячŠµŠ¹ŠŗŠø"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
+"Š’Ń‹ сŠ¾Ń…Ń€Š°Š½ŠøŠ»Šø Š²ŠµŠ±ŃŠ°Š¹Ń‚ %s ŠŗŠ°Šŗ ŠæŠµŃ€Š²Ń‹Š¹ html фŠ°Š¹Š», тŠµŠæŠµŃ€ŃŒ с Š½ŠøŠ¼ Š·Š°ŠæустŠøтŠµ "
+"html2lrf."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ ŠæрŠ¾Ń‡ŠøтŠ°Ń‚ŃŒ фŠ°Š¹Š» Š¾Š±Š»Š¾Š¶ŠŗŠø: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ ŠæрŠ¾Ń‡ŠøтŠ°Ń‚ŃŒ ŠøŠ·: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° ŠæрŠ¾Ń†ŠµŃŃŠ° фŠ°Š¹Š»Š° opf"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1023,6 +1285,13 @@ msgid ""
 "to local files recursively. Thus, you can use it to \n"
 "convert a whole tree of HTML files."
 msgstr ""
+"Usage: %prog [options] mybook.html\n"
+"\n"
+"\n"
+"%prog converts mybook.html Š² mybook.lrf. \n"
+"%prog follows Š²ŃŠµ Š»ŠøŠ½ŠŗŠø Š² mybook.html этŠ¾ рŠµŠŗурсŠøŠ²Š½Š°Ń тŠ¾Ń‡ŠŗŠ°\n"
+"Š² Š»Š¾ŠŗŠ°Š»ŃŒŠ½Š¾Š¼ фŠ°Š¹Š»Šµ. Š¢Š°ŠŗŠøŠ¼ Š¾Š±Ń€Š°Š·Š¾Š¼, Š²Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ\n"
+"ŠŗŠ¾Š½Š²ŠµŃ€Ń‚ŠøрŠ²Š°Š½ŠøŠµ цŠµŠ»Š¾Š³Š¾ Š“ŠµŃ€ŠµŠ²Š° фŠ°Š¹Š»Š¾Š² HTML."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lit/convert_from.py:15
 msgid ""
@@ -1031,55 +1300,63 @@ msgid ""
 "\n"
 "%prog converts mybook.lit to mybook.lrf"
 msgstr ""
+"Usage: %prog [options] mybook.lit\n"
+"\n"
+"\n"
+"%prog converts mybook.lit Š² mybook.lrf."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:134
 msgid ""
 "%prog book.lrf\n"
 "Convert an LRF file into an LRS (XML UTF-8 encoded) file"
 msgstr ""
+"%prog book.lrf\n"
+"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Ń‹Š²Š°ŠµŃ‚ фŠ°Š¹Š» LRF Š² фŠ°Š¹Š» LRS (XML ŠŗŠ¾Š“ŠøрŠ¾Š²ŠŗŠ° UTF-8)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:135
 msgid "Output LRS file"
-msgstr ""
+msgstr "Š’Ń‹Ń…Š¾Š“Š½Š¾Š¹ фŠ°Š¹Š» LRS"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:153
 msgid "Parsing LRF..."
-msgstr ""
+msgstr "ŠŠ½Š°Š»ŠøŠ· LRF..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:156
 msgid "Creating XML..."
-msgstr ""
+msgstr "Š”Š¾Š·Š“Š°Š½ŠøŠµ XML..."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
 msgid "LRS written to "
-msgstr ""
+msgstr "LRS ŠæŠøшŠµŃ‚ "
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:249
 msgid "Could not read from thumbnail file:"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ ŠæрŠ¾Ń‡ŠøтŠ°Ń‚ŃŒ фŠ°Š¹Š» эсŠŗŠøŠ·:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:269
 msgid ""
 "%prog [options] file.lrs\n"
 "Compile an LRS file into an LRF file."
 msgstr ""
+"%prog [options] file.lrs\n"
+"Š”Š±Š¾Ń€ŠŗŠ° фŠ°Š¹Š»Š° LRS ŠøŠ· фŠ°Š¹Š»Š° LRF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:270
 msgid "Path to output file"
-msgstr ""
+msgstr "ŠŸŃƒŃ‚ŃŒ Š“Š»Ń фŠ°Š¹Š»Š° рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Š°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:272
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:115
 msgid "Verbose processing"
-msgstr ""
+msgstr "Š”ŠµŃ‚Š°Š»ŠøŠ·Š°Ń†Šøя ŠæрŠ¾Ń†ŠµŃŃŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:274
 msgid "Convert LRS to LRS, useful for debugging."
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ LRS Š² LRS, Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼Š¾ Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
 msgid "Invalid LRF file. Could not set metadata."
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Ń€Ń‡ŠµŠ½ LRF фŠ°Š¹Š». ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ Š²Š²ŠµŃŃ‚Šø Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
 msgid ""
@@ -1089,55 +1366,64 @@ msgid ""
 "Show/edit the metadata in an LRF file.\n"
 "\n"
 msgstr ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ/Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š² фŠ°Š¹Š»Šµ LRF.\n"
+"\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:40
 msgid "Set the book title"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø Š½Š°Š·Š²Š°Š½ŠøŠµ ŠŗŠ½ŠøŠ³Šø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
 msgid "Set sort key for the title"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø ŠŗŠ»ŃŽŃ‡ сŠ¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠø ŠæŠ¾ Š·Š°Š³Š»Š°Š²Šøю"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
 msgid "Set the author"
-msgstr ""
+msgstr "Š’стŠ°Š²Šøть ŠŠ²Ń‚Š¾Ń€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
 msgid "Set sort key for the author"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø ŠŗŠ»ŃŽŃ‡ сŠ¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠø ŠæŠ¾ Š°Š²Ń‚Š¾Ń€Ńƒ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:44
 msgid "The category this book belongs to. E.g.: History"
-msgstr ""
+msgstr "ŠšŠ°Ń‚ŠøŠ³Š¾Ń€Šøя этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø. ŠŠ°ŠæрŠøŠ¼ŠµŃ€: Š˜ŃŃ‚Š¾Ń€Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
 msgid "Path to a graphic that will be set as this files' thumbnail"
 msgstr ""
+"ŠŸŃƒŃ‚ŃŒ Šŗ ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠµ, ŠŗŠ¾Ń‚Š¾Ń€Š°Ń Š±ŃƒŠ“ŠµŃ‚ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒŃŃ Š² этŠ¾Š¼ фŠ°Š¹Š»Šµ ŠŗŠ°Šŗ Š¼ŠøŠ½ŠøŠ°Ń‚ŃŽŃ€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
 msgid ""
 "Path to a txt file containing the comment to be stored in the lrf file."
 msgstr ""
+"ŠŸŃƒŃ‚ŃŒ Šŗ тŠµŠŗстŠ¾Š²Š¾Š¼Ńƒ фŠ°Š¹Š»Ńƒ сŠ¾Š“ŠµŃ€Š¶Š°Ń‰ŠµŠ¼Ńƒ ŠŗŠ¾Š¼Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠø сŠ¾Ń…Ń€Š°Š½ŃŠµŠ¼Ń‹Šµ Š² фŠ°Š¹Š» lrf."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
 msgid "Extract thumbnail from LRF file"
-msgstr ""
+msgstr "Š˜Š·Š²Š»ŠµŃ‡ŃŒ Š¼ŠøŠ½ŠøŠ°Ń‚ŃŽŃ€Ńƒ ŠøŠ· фŠ°Š¹Š»Š° lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
 msgid ""
 "Extract cover from LRF file. Note that the LRF format has no defined cover, "
 "so we use some heuristics to guess the cover."
 msgstr ""
+"Š˜Š·Š²Š»ŠµŃ‡ŃŒ Š¾Š±Š»Š¾Š¶Šŗу ŠøŠ· фŠ°Š¹Š»Š° lrf. Š—Š°Š¼ŠµŃ‡Š°Š½ŠøŠµ: ŠµŃŠ»Šø LRF фŠ¾Ń€Š¼Š° Š½Šµ сŠ¾Š“ŠµŃ€Š¶Šøт Š¾Š±Š»Š¾Š¶Šŗу, "
+"ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ Š²Š¼ŠµŃŃ‚Š¾ этŠ¾Š³Š¾ ŠŗŠ°Šŗую-Š½ŠøŠ±ŃƒŠ“ь эŠ²Ń€ŠµŃŃ‚ŠøчŠµŃŠŗŠø ŠæŠ¾Š“Š¾Š±Ń€Š°Š½Š½ŃƒŃŽ Š¾Š±Š»Š¾Š¶Šŗу."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
 msgid "Set book ID"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø ID ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
 msgid "Don't know what this is for"
-msgstr ""
+msgstr "ŠŠµ Š·Š½Š°ŃŽ, чтŠ¾ этŠ¾ тŠ°ŠŗŠ¾Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
 msgid ""
@@ -1146,15 +1432,20 @@ msgid ""
 "\n"
 "%prog converts mybook.mobi to mybook.lrf"
 msgstr ""
+"Usage: %prog [options] mybook.mobi|prc\n"
+"\n"
+"\n"
+"%prog converts mybook.mobi Š² mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:47
 msgid "Could not find pdftohtml, check it is in your PATH"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ Š½Š°Š¹Ń‚Šø pdftohtml, ŠæрŠ¾Š²ŠµŃ€ŃŒŃ‚Šµ Š½Š°Š»ŠøчŠµ ŠæŠ¾ PATH"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:61
 msgid ""
 " is an image based PDF. Only conversion of text based PDFs is supported."
 msgstr ""
+" PDF сŠ¾Š“ŠµŃ€Š¶Šøт ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø. ŠŸŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŃ‚ся ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ тŠ¾Š»ŃŒŠŗŠ¾ тŠµŠŗстŠ¾Š²Ń‹Ń… PDF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:80
 msgid ""
@@ -1163,20 +1454,26 @@ msgid ""
 "\n"
 "%prog converts mybook.pdf to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.pdf\n"
+"\n"
+"\n"
+"%prog converts mybook.pdf Š² mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:403
 msgid ""
 "Path to output directory in which to create the HTML file. Defaults to "
 "current directory."
 msgstr ""
+"ŠŸŃƒŃ‚ŃŒ Š“ŠøрŠµŠŗтŠ¾Ń€ŠøŠø рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Š°, Š³Š“Šµ сŠ¾Š·Š“Š°ŠµŃ‚ся HTML. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, тŠµŠŗущŠ°Ń "
+"Š“ŠøрŠµŠŗтŠ¾Ń€Šøя."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
 msgid "Be more verbose."
-msgstr ""
+msgstr "Š‘Š¾Š»ŃŒŃˆŠµ ŠæŠ¾Š“рŠ¾Š±Š½Š¾ŃŃ‚ŠµŠ¹."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
 msgid "You must specify a single PDF file."
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š²Ń‹Š±Ń€Š°Ń‚ŃŒ ŠµŠ“ŠøŠ½ŃŃ‚Š²ŠµŠ½Š½Ń‹Š¹ фŠ°Š¹Š» PDF."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
 msgid ""
@@ -1185,12 +1482,18 @@ msgid ""
 "\n"
 "%prog converts mybook.rtf to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.rtf\n"
+"\n"
+"\n"
+"%prog converts mybook.rtf Š² mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:146
 msgid ""
 "This RTF file has a feature calibre does not support. Convert it to HTML and "
 "then convert it."
 msgstr ""
+"Š­Ń‚Š¾Ń‚ фŠ°Š¹Š» RTF Š½Šµ ŠæŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŃ‚ся calibre. ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·ŃƒŠ¹Ń‚Šµ ŠµŠ³Š¾ Š²  HTML Šø "
+"ŠæŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ сŠ½Š¾Š²Š°."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:19
 msgid ""
@@ -1199,41 +1502,45 @@ msgid ""
 "\n"
 "%prog converts mybook.txt to mybook.lrf"
 msgstr ""
+"%prog [options] mybook.txt\n"
+"\n"
+"\n"
+"%prog converts mybook.txt Š² mybook.lrf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:42
 msgid "Set the authors"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø Š°Š²Ń‚Š¾Ń€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:46
 msgid "Set the comment"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø ŠŗŠ¾Š¼Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
-msgstr ""
+msgstr "Š—Š°Š³Š¾Š»Š¾Š²Š¾Šŗ"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Ń€(ы)"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
 msgid "Producer"
-msgstr ""
+msgstr "Š”ŠæŠ¾Š½ŃŠ¾Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:277
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:504
 msgid "Category"
-msgstr ""
+msgstr "ŠšŠ°Ń‚ŠµŠ³Š¾Ń€Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:278
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
@@ -1241,66 +1548,66 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
-msgstr ""
+msgstr "ŠšŠ¾Š¼Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
-msgstr ""
+msgstr "Š­ŠæŠøŠ»Š¾Š³"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
-msgstr ""
+msgstr "Š”ŠµŃ€Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:282
 msgid "Language"
-msgstr ""
+msgstr "ŠÆŠ·Ń‹Šŗ"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
-msgstr ""
+msgstr "Š—Š°ŠæятŠ°Ń рŠ°Š·Š“ŠµŠ»ŃŠµŃ‚ сŠæŠøсŠ¾Šŗ устŠ°Š½Š¾Š²Š»ŠµŠ½Š½Ń‹Ń… тэŠ³Š¾Š²"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
-msgstr ""
+msgstr "Š’Ń‹ŠæусŠŗŠø Šŗ ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¼ этŠ° ŠŗŠ½ŠøŠ³Š° ŠæрŠøŠ½Š°Š“Š»ŠµŠ¶Šøт"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
-msgstr ""
+msgstr "Š”ŠµŃ€Šøя Index"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
-msgstr ""
+msgstr "ŠÆŠ·Ń‹Šŗ ŠŗŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
-msgstr ""
+msgstr "Š˜Š·Š²Š»ŠµŃ‡ŃŒ Š¾Š±Š»Š¾Š¶Šŗу"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
 msgid "Usage:"
-msgstr ""
+msgstr "ŠžŠ±Ń€Š°Ń‰ŠµŠ½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:53
 msgid "Usage: imp-meta file.imp"
-msgstr ""
+msgstr "ŠžŠ±Ń€Š°Ń‰ŠµŠ½ŠøŠµ: imp-meta file.imp"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:54
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:60
 msgid "No filename specified."
-msgstr ""
+msgstr "Š˜Š¼Ń фŠ°Š¹Š»Š° Š½Šµ Š½Š°Š·Š½Š°Ń‡ŠµŠ½Š¾."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:97
 msgid ""
@@ -1315,37 +1622,50 @@ msgid ""
 "isbndb.com.\n"
 "\n"
 msgstr ""
+"\n"
+"%prog [options] key\n"
+"\n"
+"ŠŸŠ¾Š»ŃƒŃ‡Šøть Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š“Š»Ń ŠŗŠ½ŠøŠ³Šø ŠøŠ· F isndb.com. Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ Š²Š²ŠµŃŃ‚Šø \n"
+"Š“руŠ³ŠøŠµ ISBN ID Š“Š°Š½Š½Ń‹Šµ ŠŗŠ½ŠøŠ³Šø ŠøŠ»Šø ŠµŠµ Š—Š°Š³Š»Š°Š²ŠøŠµ Šø ŠŠ²Ń‚Š¾Ń€Š°. \n"
+"Š•ŃŠ»Šø Š²Ń‹ Š²Š²ŠµŠ»Šø ŠŠ°Š·Š²Š°Š½ŠøŠµ Šø ŠŠ²Ń‚Š¾Ń€Š° Š±Š¾Š»ŠµŠµ, чŠµŠ¼ Š¾Š“Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šµ, Š¾Š½Š° Š±ŃƒŠ“ŠµŃ‚ "
+"Š²Š¾Š·Š²Ń€Š°Ń‰ŠµŠ½Š°.\n"
+"\n"
+"key этŠ¾ ŠŗŠ»ŃŽŃ‡ учŠµŃ‚Š½Š¾Š¹ Š·Š°ŠæŠøсŠø ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ сŠ¾Š·Š“Š°ŠµŃ‚ся ŠæŠ¾ŃŠ»Šµ ŠæŠ¾Š“ŠæŠøсŠŗŠø ŠæуŠ±Š»ŠøчŠ½Š¾Š¹ "
+"учŠµŃ‚Š½Š¾Š¹ Š·Š°ŠæŠøсью Š½Š° сŠ°Š¹Ń‚Šµ isbndb.com.\n"
+"\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
 msgid "The ISBN ID of the book you want metadata for."
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ¶Š½Ń‹Š¹ ISBN ID ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ Š²Ń‹ хŠ¾Ń‚ŠøтŠµ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š² Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
 msgid "The author whose book to search for."
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Ń€ ŠŗŠ½ŠøŠ³Šø, ŠŗŠ¾Ń‚Š¾Ń€Š¾Š³Š¾ Š²Ń‹ хŠ¾Ń‚ŠøтŠµ Š½Š°Š¹Ń‚Šø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
 msgid "The title of the book to search for."
-msgstr ""
+msgstr "ŠŠ°Š·Š²Š°Š½ŠøŠµ ŠŗŠ½ŠøŠ³Šø, ŠŗŠ¾Ń‚Š¾Ń€ŃƒŃŽ Š²Ń‹ хŠ¾Ń‚ŠøтŠµ Š½Š°Š¹Ń‚Šø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
 msgid "The publisher of the book to search for."
-msgstr ""
+msgstr "Š˜Š·Š“Š°Ń‚ŠµŠ»ŃŒŃŃ‚Š²Š¾ ŠŗŠ½ŠøŠ³Šø, ŠŗŠ¾Ń‚Š¾Ń€Š¾Šµ Š²Ń‹ хŠ¾Ń‚ŠøтŠµ Š½Š°Š¹Ń‚Šø."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:47
 msgid ""
 "Could not fetch cover as server is experiencing high load. Please try again "
 "later."
 msgstr ""
+"ŠŠµ Š¼Š¾Š³Ńƒ Š·Š°Š³Ń€ŃƒŠ·Šøть Š¾Š±Š»Š¾Š¶Šŗу тŠ°Šŗ, ŠŗŠ°Šŗ сŠµŃ€Š²ŠµŃ€ сŠøŠ»ŃŒŠ½Š¾ Š·Š°Š³Ń€ŃƒŠ¶ŠµŠ½. ŠŸŠ¾Š¶Š°Š»ŃƒŃŃ‚Š°, "
+"ŠæŠ¾Š²Ń‚Š¾Ń€ŠøтŠµ ŠæŠ¾ŠæытŠŗу ŠæŠ¾Š·Š“Š½ŠµŠµ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:48
 msgid " not found."
-msgstr ""
+msgstr " ŠŠµ Š½Š°Š¹Š“ŠµŠ½Š¾."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:51
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:82
 msgid "LibraryThing.com server error. Try again later."
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° сŠµŃ€Š²ŠµŃ€Š° LibraryThing.com. ŠŸŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ ŠæŠ¾Š·Š“Š½ŠµŠµ."
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
 msgid ""
@@ -1354,320 +1674,401 @@ msgid ""
 "\n"
 "Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
 msgstr ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ° ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя Š¾Š±Š»Š¾Š¶ŠŗŠø Š“Š»Ń ŠŗŠ½ŠøŠ³Šø рŠ°ŃŠæŠ¾Š·Š½Š°ŠµŃ‚ся чŠµŃ€ŠµŠ· ISBN Š½Š° сŠ°Š¹Ń‚Šµ "
+"LibraryThing.com\n"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:40
 msgid "Usage: %s file.lit"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся: %s file.lit"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:50
 msgid "Cover saved to"
-msgstr ""
+msgstr "ŠžŠ±Š»Š¾Š¶ŠŗŠ° сŠ¾Ń…Ń€Š°Š½ŠµŠ½Š°"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
-msgstr ""
+msgstr "Š’Š²ŠµŃŃ‚Šø ŠæŠ¾Š»Šµ dc:language"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
 msgid "Usage: pdf-meta file.pdf"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ°: pdf-meta file.pdf"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:59
 msgid "Usage: rb-meta file.rb"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ°: rb-meta file.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
-msgstr ""
+msgstr "%prog [options] myebook.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
-msgstr ""
+msgstr "ŠŠµŠæŠ¾ŃŃ€ŠµŠ“стŠ²ŠµŠ½Š½Š¾ MOBI HTML сŠ¾Ń…Ń€Š°Š½ŠµŠ½ Š²"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
 msgid "The output directory. Defaults to the current directory."
-msgstr ""
+msgstr "Š”ŠøрŠµŠŗтŠ¾Ń€Šøя рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Š°. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, тŠµŠŗущŠ°Ń Š“ŠøрŠµŠŗтŠ¾Ń€Šøя."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
-msgstr ""
+msgstr "Š§Š°ŃŃ‚Š¾ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Š°Ń Š“ŠøрŠµŠŗтŠ¾Ń€Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
 msgid "Send file to storage card instead of main memory by default"
-msgstr ""
+msgstr "ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, Š¾Ń‚ŠæрŠ°Š²Š»ŃŃ‚ŃŒ фŠ°Š¹Š» Š² ŠŗŠ°Ń€Ń‚Ńƒ ŠæŠ°Š¼ŃŃ‚Šø, Š²Š¼ŠµŃŃ‚Š¾ Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ ŠæŠ°Š¼ŃŃ‚Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
 msgid "The format to use when saving single files to disk"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся, ŠŗŠ¾Š³Š“Š° сŠ¾Ń…Ń€Š°Š½ŃŠµŃ‚ся ŠµŠ“ŠøŠ½ŃŃ‚Š²ŠµŠ½Š½Ń‹Š¹ фŠ°Š¹Š» Š½Š° Š“ŠøсŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
 msgid "Confirm before deleting"
-msgstr ""
+msgstr "ŠŸŠ¾Š“тŠ²ŠµŃ€Š“Šøть ŠæŠµŃ€ŠµŠ“ уŠ“Š°Š»ŠµŠ½ŠøŠµŠ¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
 msgid "Toolbar icon size"
-msgstr ""
+msgstr "Š Š°Š·Š¼ŠµŃ€ ŠøŠŗŠ¾Š½Š¾Šŗ рŠ°Š±Š¾Ń‡ŠµŠ¹ ŠæŠ°Š½ŠµŠ»Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
 msgid "Show button labels in the toolbar"
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ Š½Š°Š·Š²Š°Š½ŠøŠµ ŠŗŠ½Š¾ŠæŠ¾Šŗ Š½Š° рŠ°Š±Š¾Ń‡ŠµŠ¹ ŠæŠ°Š½Š°Š»Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
 msgid "Main window geometry"
-msgstr ""
+msgstr "Š“ŠµŠ¾Š¼ŠµŃ‚Ń€Šøя Š¾ŃŠ½Š¾Š²Š½Š¾Š³Š¾ Š¾ŠŗŠ½Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
 msgid "Notify when a new version is available"
-msgstr ""
+msgstr "Š”Š¾Š¾Š±Ń‰Šøть, ŠµŃŠ»Šø Š“Š¾ŃŃ‚ŃƒŠæŠ½Š° Š½Š¾Š²Š°Ń Š²ŠµŃ€ŃŠøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
 msgid "Use Roman numerals for series number"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š ŠøŠ¼ŃŠŗŠøŠµ цŠøфры Š“Š»Ń Š½ŃƒŠ¼ŠµŃ€Š°Ń†ŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
 msgid "Sort tags list by popularity"
-msgstr ""
+msgstr "Š”Š¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒ сŠæŠøсŠ¾Šŗ эŠæŠøŠ»Š¾Š³Š¾Š² ŠæŠ¾ ŠæŠ¾ŠæуŠ»ŃŃ€Š½Š¾ŃŃ‚Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
 msgid "Number of covers to show in the cover browsing mode"
-msgstr ""
+msgstr "ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ Š¾Š±Š»Š¾Š¶ŠµŠŗ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°ŠµŠ¼Ń‹Ń… Š² рŠµŠ¶ŠøŠ¼Šµ ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° Š¾Š±Š»Š¾Š¶ŠµŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
 msgid "Defaults for conversion to LRF"
-msgstr ""
+msgstr "ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ Š² LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
 msgid "Options for the LRF ebook viewer"
-msgstr ""
+msgstr "ŠžŠæцŠøŠø Š“Š»Ń ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° эŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
 msgid "Formats that are viewed using the internal viewer"
-msgstr ""
+msgstr "Š­Ń‚Š¾Ń‚ фŠ¾Ń€Š¼Š°Ń‚ ŠæрŠ¾ŃŠ¼Š°Ń‚Ń€ŠøŠ²Š°ŠµŃ‚ся ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃ Š²ŃŃ‚Ń€Š¾ŠµŠ½Š½Ń‹Š¹ ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š¾Š²Ń‰ŠøŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
 msgid "Columns to be displayed in the book list"
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ ŠŗŠ¾Š»Š¾Š½ŠŗŠø Š² сŠæŠøсŠŗŠµ ŠŗŠ½ŠøŠ³"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
 msgid "Automatically launch content server on application startup"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø Š·Š°ŠæусŠŗŠ°Ń‚ŃŒ сŠµŃ€Š²ŠµŃ€ ŠŗŠ¾Š½ŠµŠ½Ń‚Š° ŠæрŠø Š·Š°ŠæусŠŗŠµ ŠæрŠøŠ»Š¾Š¶ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
 msgid "Oldest news kept in database"
-msgstr ""
+msgstr "Š’ Š±Š°Š·Šµ Š“Š°Š½Š½Ń‹Ń… сŠ¾Š“ŠµŃ€Š¶Š°Ń‚ся стŠ°Ń€Ń‹Šµ Š½Š¾Š²Š¾ŃŃ‚Šø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ ŠøŠŗŠ¾Š½Šŗу Š² ŠæŠ°Š½ŠµŠ»Šø Š·Š°Š“Š°Ń‡"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть Š² устрŠ¾Š¹ŃŃ‚Š²Š¾ Š·Š°ŠŗŠ°Ń‡ŠµŠ½Š½Ń‹Šµ Š½Š¾Š²Š¾ŃŃ‚Šø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr "Š£Š“Š°Š»Šøть ŠŗŠ½ŠøŠ³Šø ŠøŠ· Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø ŠæŠ¾ŃŠ»Šµ Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø Š² устрŠ¾Š¹ŃŃ‚Š²Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
-msgstr ""
+msgstr "Š£ŃŃ‚Ń€Š¾Š¹ŃŃ‚Š²Š¾ Š½Šµ ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
 msgid "Get device information"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю Š¾ устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
 msgid "Get list of books on device"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть сŠæŠøсŠ¾Šŗ ŠŗŠ½ŠøŠ³ Š½Š° устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
 msgid "Send metadata to device"
-msgstr ""
+msgstr "ŠžŃ‚ŠæрŠ°Š²Šøть Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š² устрŠ¾Š¹ŃŃ‚Š²Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:144
 msgid "Upload %d books to device"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ¶ŠµŠ½Š¾ %d ŠŗŠ½ŠøŠ³ Š½Š° устрŠ¾Š¹ŃŃ‚Š²Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:159
 msgid "Delete books from device"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть ŠŗŠ½ŠøŠ³Šø ŠøŠ· устрŠ¾Š¹ŃŃ‚Š²Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:174
 msgid "Download books from device"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть ŠŗŠ½ŠøŠ³Šø ŠøŠ· устрŠ¾Š¹ŃŃ‚Š²Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:184
 msgid "View book on device"
-msgstr ""
+msgstr "Š”Š¼Š¾Ń‚Ń€ŠµŃ‚ŃŒ ŠŗŠ½ŠøŠ³Šø Š½Š° устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
-msgstr ""
+msgstr "ŠŸŃƒŃ‚ŃŒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:52
 msgid "Dialog"
-msgstr ""
+msgstr "Š”ŠøŠ°Š»Š¾Š³"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
-msgstr ""
+msgstr "ŠœŠµŃ‚ŠŗŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
 msgid "&Previous"
-msgstr ""
+msgstr "&ŠŸŃ€ŠµŠ“ыŠ“ущŠøŠ¹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
 msgid "&Next"
-msgstr ""
+msgstr "&Š”Š»ŠµŠ“ующŠøŠ¹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
 msgid "Choose Format"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ фŠ¾Ń€Š¼Š°Ń‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
 msgid "Set defaults for conversion of comics (CBR/CBZ files)"
-msgstr ""
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть ŠŗŠ¾Š½Š²ŠµŃ€Ń‚ŠøрŠ¾Š²Š°Š½ŠøŠµ ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю ŠŗŠ¾Š¼ŠøŠŗсŠ¾Š² (фŠ°Š¹Š»Ń‹ CBR/CBZ)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
 msgid "Set options for converting %s"
-msgstr ""
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š²Š°Ń€ŠøŠ°Š½Ń‚Ń‹ Š“Š»Ń ŠŗŠ¾Š½Š²ŠµŃ€Ń‚Š°Ń†ŠøŠø  %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:89
 msgid "&Title:"
-msgstr ""
+msgstr "&ŠŠ°Š·Š²Š°Š½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:90
 msgid "&Author(s):"
-msgstr ""
+msgstr "&ŠŠ²Ń‚Š¾Ń€(ы):"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
 msgid "&Number of Colors:"
-msgstr ""
+msgstr "&ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ цŠ²ŠµŃ‚Š¾Š²:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:398
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:548
 msgid "&Profile:"
-msgstr ""
+msgstr "&ŠŸŃ€Š¾Ń„ŠøŠ»ŃŒ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
 msgid "Disable &normalize"
-msgstr ""
+msgstr "Š‘Š»Š¾ŠŗŠøрŠ¾Š²Š°Ń‚ŃŒ &уŠæŠ¾Ń€ŃŠ“Š¾Ń‡ŠøŠ²Š°Š½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
 msgid "Keep &aspect ratio"
-msgstr ""
+msgstr "Š”Š¾Ń…Ń€Š°Š½Šøть &сŠ¾Š¾Ń‚Š½Š¾ŃˆŠµŠ½ŠøŠµ стŠ¾Ń€Š¾Š½"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
 msgid "Disable &Sharpening"
-msgstr ""
+msgstr "Š‘Š»Š¾ŠŗŠøрŠ¾Š²Š°Ń‚ŃŒ ŠæŠ¾Š²Ń‹ŃˆŠµŠ½ŠøŠµ &рŠµŠ·ŠŗŠ¾ŃŃ‚Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
 msgid "&Landscape"
-msgstr ""
+msgstr "&ŠŠ»ŃŒŠ±Š¾Š¼Š½Š°Ń"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
 msgid "Don't so&rt"
-msgstr ""
+msgstr "ŠŠµ сŠ¾Ń€Ń‚&ŠøрŠ¾Š²Š°Ń‚ŃŒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
 msgid "&Right to left"
-msgstr ""
+msgstr "&Š”ŠæрŠ°Š²Š° Š½Š° Š»ŠµŠ²Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
 msgid "De&speckle"
-msgstr ""
+msgstr "ŠšŠ¾Š½Ń‚&рŠ°ŃŃ‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
 msgid "&Wide"
+msgstr "&ŠØŠøрŠ¾ŠŗŠøŠ¹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
-msgstr ""
+msgstr "Š Š°ŃŃˆŠøрŠµŠ½Š½Ń‹Š¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "ŠžŠ±Ń‰ŠøŠ¹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Š˜Š½Ń‚ŠµŃ€Ń„ŠµŠ¹Ń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
+"Š”ŠµŃ€Š²ŠµŃ€\n"
+"ŠšŠ¾Š½Ń‚ŠµŠ½Ń‚Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
-msgstr ""
+msgstr "Š›Š¾Š³ Š¾ŃˆŠøŠ±Š¾Šŗ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
-msgstr ""
+msgstr "Š›Š¾Š³ Š“Š¾ŃŃ‚ŃƒŠæŠ°:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
-msgstr ""
+msgstr "Š”Š±Š¾Š¹ Š·Š°ŠæусŠŗŠ° ŠŗŠ¾Š½Ń‚ŠµŠ½Ń‚ сŠµŃ€Š²ŠµŃ€Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "ŠŠµŠ²ŠµŃ€Š½Ń‹Š¹ рŠ°Š·Š¼ŠµŃ€"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr "Š Š°Š·Š¼ŠµŃ€ %s уŠŗŠ°Š·Š°Š½ Š½ŠµŠ²ŠµŃ€Š½Š¾. Š”Š¾Š»Š¶ŠµŠ½ Š±Ń‹Ń‚ŃŒ Š·Š°Š“Š°Š½ Š² Š²ŠøŠ“Šµ [шŠøрŠøŠ½Š°]x[Š²Ń‹ŃŠ¾Ń‚Š°]"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
-msgstr ""
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
-msgstr ""
+msgstr "<br>Š”Š¾Š»Š¶Š½Š° Š±Ń‹Ń‚ŃŒ Š“ŠøррŠµŠŗтŠ¾Ń€Šøя."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
-msgstr ""
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń… "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
-msgstr ""
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń….<br>ŠŠµŠ¼Š¾Š³Ńƒ Š·Š°ŠæŠøсŠ°Ń‚ŃŒ "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
-msgstr ""
+msgstr "Š”Š¶Š°Ń‚ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…. Š­Ń‚Š¾ Š·Š°Š¹Š¼ŠµŃ‚ Š½ŠµŠŗŠ¾Ń‚Š¾Ń€Š¾Šµ Š²Ń€ŠµŠ¼Ń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
-msgstr ""
+msgstr "Š”Š¶Š°Ń‚ŠøŠµ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
-msgstr ""
+msgstr "ŠšŠ¾Š½Ń„ŠøŠ³ŃƒŃ€Š°Ń†Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
-msgstr ""
+msgstr "&Š Š°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ ŠŗŠ½ŠøŠ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŃŠ¼Š¾Ń‚Ń€ŠµŃ‚ŃŒ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š½Š¾Š²Š¾Š¹ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1683,189 +2084,212 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
-msgstr ""
+msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ сŠ¾Š¾Š±Ń‰ŠµŠ½ŠøŠµ, ŠµŃŠ»Šø Š“Š¾ŃŃ‚ŃƒŠæŠ½Š° &Š½Š¾Š²Š°Ń Š²ŠµŃ€ŃŠøя."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
-msgstr ""
+msgstr "Š§ŠøтŠ°Ń‚ŃŒ &Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ ŠøŠ· фŠ°Š¹Š»Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ Š“Š»Ń ŠµŠ“ŠøŠ½ŃŃ‚Š²ŠµŠ½Š½Š¾Š³Š¾ сŠ¾Ń…Ń€Š°Š½ŠµŠ½Š½Š¾Š³Š¾ фŠ°Š¹Š»Š°:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
-msgstr ""
+msgstr "&Š—Š°Š“ŠµŃ€Š¶ŠŗŠ° сŠµŃ‚Šø ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
+"Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š·Š°Š“ŠµŃ€Š¶Šŗу ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š“Š»Ń сŠµŃ‚ŠµŠ²Ń‹Ń… Š²Ń‹Š·Š¾Š²Š¾Š² (т.Šµ. Š² Š»ŃŽŠ±Š¾Šµ Š²Ń€ŠµŠ¼Ń Š²Ń‹ "
+"Š²Ń‹Ń…Š¾Š“ŠøтŠµ Š² ŠøŠ½Ń‚ŠµŃ€Š½ŠµŃ‚ Š“Š»Ń ŠæŠ¾Š»ŃƒŃ‡ŠµŠ½Šøя ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†ŠøŠø)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
-msgstr ""
+msgstr " сŠµŠŗуŠ½Š“"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ &яŠ·Ń‹Šŗ (Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼ рŠµŃŃ‚Š°Ń€Ń‚):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "Š’ысŠ¾ŠŗŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "ŠŠøŠ·ŠŗŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "&ŠŸŃ€ŠøŠ¾Ń€ŠøтŠµŃ‚ Š·Š°Š“Š°Ń‡Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š“ŠøрŠµŠŗтŠ¾Ń€Šøю Š² сŠæŠøсŠ¾Šŗ чŠ°ŃŃ‚Š¾ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Ń‹Ń… Š“ŠµŃ€ŠøŠŗтŠ¾Ń€ŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть Š“ŠøрŠµŠŗтŠ¾Ń€Šøю ŠøŠ· сŠæŠøсŠŗŠ° чŠ°ŃŃ‚Š¾ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼Ń‹Ń… Š“ŠµŃ€ŠøŠŗтŠ¾Ń€ŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ &Š ŠøŠ¼ŃŠŗŠøŠµ цŠøфры Š“Š»Ń Š½ŃƒŠ¼ŠµŃ€Š°Ń†ŠøŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
+"&ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ Š¾Š±Š»Š¾Š¶ŠµŠŗ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°ŠµŠ¼Ń‹Ń… Š² рŠµŠ¶ŠøŠ¼Šµ ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° (ŠæŠ¾ŃŠ»Šµ ŠæŠµŃ€ŠµŠ·Š°Š³Ń€ŃƒŠ·ŠŗŠø):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
-msgstr ""
+msgstr "ŠŸŠ°Š½ŠµŠ»ŃŒ ŠøŠ½ŃŃ‚Ń€ŃƒŠ¼ŠµŠ½Ń‚Š¾Š²"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
-msgstr ""
+msgstr "Š‘Š¾Š»ŃŒŃˆŠ¾Š¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
-msgstr ""
+msgstr "Š”рŠµŠ“Š½ŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
-msgstr ""
+msgstr "ŠœŠ°Š»ŠµŠ½ŃŒŠŗŠøŠ¹"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
-msgstr ""
+msgstr "&Š Š°Š·Š¼ŠµŃ€ ŠŗŠ½Š¾ŠæŠ¾Šŗ Š½Š° ŠæŠ°Š½ŠµŠ»Šµ ŠøŠ½ŃŃ‚Ń€ŃƒŠ¼ŠµŠ½Ń‚Š¾Š²"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ Š½Š°Š“ŠæŠøсŠø Š½Š° ŠŗŠ½Š¾ŠæŠŗŠ°Ń… ŠæŠ°Š½ŠµŠ»Šø ŠøŠ½ŃŃ‚Ń€ŃƒŠ¼ŠµŠ½Ń‚Š¾Š²"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ Š²ŠøŠ“ŠøŠ¼Ń‹Šµ &стŠ¾Š»Š±Ń†Ń‹ Š² ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Šµ Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š²ŃŃ‚Ń€Š¾ŠµŠ½Š½Ń‹Š¹ ŠæрŠ¾ŃŠ¼Š°Ń‚Ń€Š¾Š²Ń‰ŠøŠŗ Š“Š»Ń сŠ»ŠµŠ“ующŠøх фŠ¾Ń€Š¼Š°Ń‚Š¾Š²:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr "ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠøŠŗŠ¾Š½Šŗу Š² сŠøстŠµŠ¼Š½Š¾Š¹ ŠæŠ°Š½ŠµŠ»Šµ (Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼ рŠµŃŃ‚Š°Ń€Ń‚)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "ŠžŃ‚ŠæрŠ°Š²Š»ŃŃ‚ŃŒ Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø Š·Š°ŠŗŠ°Ń‡ŠµŠ½Š½Ń‹Šµ Š½Š¾Š²Š¾ŃŃ‚Šø Š² устрŠ¾Š¹ŃŃ‚Š²Š¾ Š“Š»Ń чтŠµŠ½Šøя"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "Š£Š“Š°Š»ŃŃ‚ŃŒ Š½Š¾Š²Š¾ŃŃ‚Šø ŠøŠ· Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø ŠæŠ¾ŃŠ»Šµ Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø Š² устрŠ¾Š¹ŃŃ‚Š²Š¾"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
-msgstr ""
+msgstr "Š”Š²Š¾Š±Š¾Š“Š½Š¾Šµ Š½ŠµŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Š½Š¾Šµ ŠæрŠ¾ŃŃ‚Ń€Š°Š½ŃŃ‚Š²Š¾ ŠøŠ· Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
-msgstr ""
+msgstr "&Š£ŠæŠ°ŠŗŠ¾Š²Š°Ń‚ŃŒ Š±Š°Š·Ńƒ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
-msgstr ""
+msgstr "&ŠœŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ ŠøŠ· фŠ°Š¹Š»Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
+"calibre ŠøŠ¼ŠµŠµŃ‚ сŠµŃ‚ŠµŠ²Š¾Š¹ сŠµŃ€Š²ŠµŃ€ ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ ŠæŠ¾Š·Š²Š¾Š»ŃŠµŃ‚ ŠæрŠµŠ“Š¾ŃŃ‚Š°Š²Š»ŃŃ‚ŃŒ Š“Š¾ŃŃ‚ŃƒŠæ Šŗ "
+"ŠŗŠ¾Š»Š»ŠµŠŗцŠøŠø Š²Š°ŃˆŠøх ŠŗŠ½ŠøŠ³, ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃ Š±Ń€Š°ŃƒŠ·ŠµŃ€ Š³Š“Šµ-уŠ³Š¾Š“Š½Š¾ Š² Š¼ŠøрŠµ. Š Š°Š·Š»ŠøчŠ½Ń‹Šµ "
+"ŠøŠ·Š¼ŠµŠ½ŠµŠ½Šøя Š² Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠ°Ń… Š±ŃƒŠ“ут ŠæрŠøŠ¼ŠµŠ½ŠµŠ½Ń‹ ŠæŠ¾ŃŠ»Šµ рŠµŃŃ‚Š°Ń€Ń‚Š° сŠµŃ€Š²ŠµŃ€Š°."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
-msgstr ""
+msgstr "&ŠŸŠ¾Ń€Ń‚ сŠµŃ€Š²ŠµŃ€Š°:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
-msgstr ""
+msgstr "&ŠŸŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŒ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
-msgstr ""
+msgstr "&ŠŸŠ°Ń€Š¾Š»ŃŒ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
+"Š•ŃŠ»Šø Š²Ń‹ Š¾ŃŃ‚Š°Š²ŠøŠ»Šø ŠæŠ°Ń€Š¾Š»ŃŒ чŠøстыŠ¼, ŠŗтŠ¾-уŠ³Š¾Š“Š½Š¾ ŠæŠ¾Š»ŃƒŃ‡Šøт Š“Š¾ŃŃ‚ŃƒŠæ Šŗ Š²Š°ŃˆŠøŠ¼ ŠŗŠ½ŠøŠ³Š°Š¼ "
+"ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃŽ Š²ŠµŠ±-ŠøŠ½Ń‚ŠµŃ€Ń„ŠµŠ¹Ń."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
-msgstr ""
+msgstr "&ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ ŠæŠ°Ń€Š¾Š»ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+"ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ рŠ°Š·Š¼ŠµŃ€ ([шŠøрŠøŠ½Š°]x[Š²Ń‹ŃŠ¾Ń‚Š°]) Š¾Š±Š»Š¾Š¶ŠµŠŗ ŠæрŠø Š¾Ń‚Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠø. Š‘Š¾Š»ŠµŠµ "
+"ŠŗруŠæŠ½Ń‹Šµ Š¾Š±Š»Š¾Š¶ŠŗŠø ŠæŠ¾Š“Š³Š¾Š½ŃŃŽŃ‚ся ŠæŠ¾ рŠ°Š·Š¼ŠµŃ€Ńƒ. "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr "ŠœŠ°Šŗс. рŠ°Š·Š¼ŠµŃ€ Š¾Š±Š»Š¾Š¶ŠŗŠø:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
-msgstr ""
+msgstr "&Š—Š°ŠæустŠøть сŠµŃ€Š²ŠµŃ€"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
-msgstr ""
+msgstr "ŠžŃŃ‚&Š°Š½Š¾Š²Šøть сŠµŃ€Š²ŠµŃ€"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
-msgstr ""
+msgstr "&ŠŸŃ€Š¾Š²ŠµŃ€Šøть сŠµŃ€Š²ŠµŃ€"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
-msgstr ""
+msgstr "Š—Š°ŠæустŠøть сŠµŃ€Š²ŠµŃ€ &Š°Š²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø ŠæŠ¾ŃŠ»Šµ Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŃŠ¼Š¾Ń‚Ń€ŠµŃ‚ŃŒ Š»Š¾Š³Šø &сŠµŃ€Š²ŠµŃ€Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1873,48 +2297,90 @@ msgid ""
 "iphone. Here myhostname should be the fully qualified hostname or the IP "
 "address of this computer."
 msgstr ""
+"Š•ŃŠ»Šø Š²Ń‹ хŠ¾Ń‚ŠøтŠµ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠŗŠ¾Š½Ń‚ŠµŠ½Ń‚-сŠµŃ€Š²ŠµŃ€ Š“Š»Ń Š“Š¾ŃŃ‚ŃƒŠæŠ° Šŗ сŠ²Š¾ŠµŠ¹ Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠµ "
+"ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃ iPhone с устŠ°Š½Š¾Š²Š»ŠµŠ½Š½Š¾Š¹ ŠæрŠ¾Š³Ń€Š°Š¼Š¼Š¾Š¹ Stanza, Š²Š°Š¼ Š½Š°Š“Š¾ Š“Š¾Š±Š°Š²Šøть URL "
+"Š²ŠøŠ“Š° http://myhostname:8080/stanza, ŠŗŠ°Šŗ Š½Š¾Š²Ń‹Š¹ ŠŗŠ°Ń‚Š°Š»Š¾Š³ Š² Stanza. Š“Š“Šµ "
+"myhostname Š“Š¾Š»Š¶ŠµŠ½ Š±Ń‹Ń‚ŃŒ ŠæŠ¾Š»Š½Š¾Šµ ŠøŠ¼Ń Š“Š¾Š¼ŠµŠ½Š° ŠøŠ»Šø IP Š°Š“рŠµŃŃ ŠŗŠ¾Š¼ŠæьютŠµŃ€Š°."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
-msgstr ""
+msgstr "ŠžŠØŠ˜Š‘ŠšŠ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:50
 msgid "Bulk convert to EPUB"
-msgstr ""
+msgstr "ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠ¹ Š² EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
 msgid "Convert %s to EPUB"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Š¾ %s Š² EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
-msgstr ""
+msgstr "ŠœŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
 msgid "Look & Feel"
-msgstr ""
+msgstr "Š’ŠøŠ“ Šø фуŠ½ŠŗцŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
 msgid "Page Setup"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠ° стрŠ°Š½Šøцы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
 msgid "Chapter Detection"
-msgstr ""
+msgstr "Š Š°ŃŠæŠ¾Š·Š½Š°Š²Š°Š½ŠøŠµ Š³Š»Š°Š²Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:84
 msgid ""
@@ -1922,146 +2388,152 @@ msgid ""
 "\n"
 "Metadata will be updated in the database as well as the generated EPUB file."
 msgstr ""
+"Š—Š°Š“Š°Š½Š½Ń‹ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ, тŠ°ŠŗŠøŠµ ŠŗŠ°Šŗ Š·Š°Š³Š»Š°Š²ŠøŠµ Šø Š°Š²Ń‚Š¾Ń€ ŠŗŠ½ŠøŠ³Šø.\n"
+"\n"
+"ŠœŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š±ŃƒŠ“ут ŠøŠ·Š¼ŠµŠ½ŠµŠ½Ń‹ Š² Š±Š°Š·Šµ Š“Š°Š½Š½Ń‹Ń…, ŠŗŠ°Šŗ тŠ¾Š»ŃŒŠŗŠ¾ сŠ¾Š·Š“Š°Ń‚ŃŒŃŃ фŠ°Š¹Š» EPUB."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:85
 msgid ""
 "Adjust the look of the generated EPUB file by specifying things like font "
 "sizes."
-msgstr ""
+msgstr "ŠŸŠ¾Š“Š¾Š±Ń€Š°Ń‚ŃŒ ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€ сŠ¾Š·Š“Š°Š½Š½Š¾Š³Š¾ фŠ°Š¹Š»Š° EPUB устŠ°Š½Š¾Š²ŠŗŠ¾Š¹ рŠ°Š·Š¼ŠµŃ€Š° шрŠøфтŠ°."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:86
 msgid "Specify the page layout settings like margins."
-msgstr ""
+msgstr "Š£ŃŃ‚Š°Š½Š¾Š²Šøть Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø фŠ¾Ń€Š¼Š°Ń‚Š° стрŠ°Š½Šøцы с ŠæŠ¾Š»ŃŠ¼Šø."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:87
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
 msgid "Fine tune the detection of chapter and section headings."
-msgstr ""
+msgstr "ŠŸŠ¾Š“ŠæрŠ°Š²Šøть Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š½Ń‹Šµ Š³Š»Š°Š²Ń‹ Šø Š·Š°Š³Š°Š»Š¾Š²ŠŗŠø рŠ°Š·Š“ŠµŠ»Š¾Š²."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:93
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
 msgid "Choose cover for "
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ Š¾Š±Š»Š¾Š¶Šŗу "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
-msgstr ""
+msgstr "ŠŠµ чŠøтŠ°ŠµŃ‚ся"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
-msgstr ""
+msgstr "Š£ Š²Š°Ń Š½ŠµŃ‚ рŠ°Š·Ń€ŠµŃˆŠµŠ½Šøя Š½Š° чтŠµŠ½ŠøŠµ этŠ¾Š³Š¾ фŠ°Š¹Š»Š°: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° чтŠµŠ½Šøя фŠ°Š¹Š»Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
-msgstr ""
+msgstr "<p>ŠžŃˆŠøŠ±ŠŗŠ° ŠæрŠø чтŠµŠ½ŠøŠø фŠ°Š¹Š»Š°:<br /><b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:116
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:190
 msgid " is not a valid picture"
-msgstr ""
+msgstr " Š½ŠµŠ²ŠµŃ€Š½Š¾Šµ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
-msgstr ""
+msgstr "ŠŠµ ŠæрŠµŠ¾Š±Ń€Š°Š·ŃƒŠµŃ‚ся"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:228
 msgid "This book has no available formats"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ ŠŗŠ½ŠøŠ³Šø Š½Šµ Š“Š¾ŃŃ‚ŃƒŠæŠµŠ½"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
 msgid "No available formats"
-msgstr ""
+msgstr "ŠŠµ Š“Š¾ŃŃ‚ŃƒŠæŠ½Ń‹Š¹ фŠ¾Ń€Š¼Š°Ń‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:234
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94
 msgid "Cannot convert %s as this book has no supported formats"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ %s, ŠŗŠ½ŠøŠ³Š° Š½ŠµŠøŠ·Š²ŠµŃŃ‚Š½Š¾Š³Š¾ фŠ¾Ń€Š¼Š°Ń‚Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:238
 msgid "Choose the format to convert to EPUB"
-msgstr ""
+msgstr "Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ фŠ¾Ń€Š¼Š°Ń‚ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя Š² EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:249
 msgid "Invalid XPath expression"
-msgstr ""
+msgstr "ŠŠµŠ²ŠµŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ XPath"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:250
 msgid "The expression %s is invalid. Error: %s"
-msgstr ""
+msgstr "Š’Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ %s Š½ŠµŠ²ŠµŃ€Š½Š¾Šµ. ŠžŃˆŠøŠ±ŠŗŠ°: %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:369
 msgid "Convert to EPUB"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ Š² EPUB"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:370
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:506
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:315
 msgid "Book Cover"
-msgstr ""
+msgstr "ŠžŠ±Š»Š¾Š¶ŠŗŠ° ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
-msgstr ""
+msgstr "Š—Š°Š¼ŠµŠ½ŠµŠ½Š¾ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠµ &Š¾Š±Š»Š¾Š¶ŠŗŠø:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŃŠ¼Š°Ń‚Ń€ŠµŃ‚ŃŒ ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя Š“Š»Ń Š¾Š±Š»Š¾Š¶ŠŗŠø этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š¾Š±Š»Š¾Š¶Šŗу ŠøŠ· &ŠøсхŠ¾Š“Š½Š¾Š³Š¾ фŠ°Š¹Š»Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
 msgid "&Title: "
-msgstr ""
+msgstr "&Š—Š°Š³Š¾Š»Š¾Š²Š¾Šŗ: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:376
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:280
 msgid "Change the title of this book"
-msgstr ""
+msgstr "Š˜Š·Š¼ŠµŠ½Šøть Š·Š°Š³Š¾Š»Š¾Š²Š¾Šŗ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
-msgstr ""
+msgstr "&ŠŠ²Ń‚Š¾Ń€(ы) "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
 "an &. If the author name contains an &, use && to represent it."
 msgstr ""
+"Š˜Š·Š¼ŠµŠ½ŠøтŠµ Š°Š²Ń‚Š¾Ń€Š°(Š¾Š²) этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø. ŠŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ Š°Š²Ń‚Š¾Ń€Š¾Š² Š“Š¾Š»Š¶Š½Ń‹ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒŃŃ чŠµŃ€ŠµŠ· "
+"сŠøŠ¼Š²Š¾Š» &. Š•ŃŠ»Šø ŠøŠ¼Ń Š°Š²Ń‚Š¾Ń€Š° сŠ¾Š“ŠµŃ€Š¶Šøт Š°Š½Š°Š»Š¾Š³ŠøчŠ½Ń‹Š¹ сŠøŠ¼Š²Š¾Š» &, тŠ¾ Š“Š»Ń ŠµŠ³Š¾ "
+"Š¾Ń‚Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ && сŠøŠ¼Š²Š¾Š»."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:379
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:515
 msgid "Author So&rt:"
-msgstr ""
+msgstr "Š”Š¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠ° ŠŠ²Ń‚Š¾Ń€Š¾Š²"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:380
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
@@ -2069,53 +2541,56 @@ msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by a "
 "comma"
 msgstr ""
+"Š˜Š·Š¼ŠµŠ½ŠøтŠµ ŠŠ²Ń‚Š¾Ń€Š°(Š¾Š²) ŠŗŠ½ŠøŠ³Šø. ŠŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ Š°Š²Ń‚Š¾Ń€Š¾Š² Š“Š¾Š»Š¶Š½Ń‹ Š±Ń‹Ń‚ŃŒ рŠ°Š·Š“ŠµŠ»ŠµŠ½Ń‹ Š·Š°ŠæятŠ¾Š¹."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
-msgstr ""
+msgstr "&Š˜Š·Š“Š°Ń‚ŠµŠ»ŃŒŃŃ‚Š²Š¾: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
-msgstr ""
+msgstr "Š˜Š·Š¼ŠµŠ½Šøть Š˜Š·Š“Š°Ń‚ŠµŠ»ŃŒŃŃ‚Š²Š¾ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:383
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:519
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:295
 msgid "Ta&gs: "
-msgstr ""
+msgstr "ŠŸŠ¾Š¼ŠµŃ‚ŠŗŠø: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
 "<br><br>They can be any words or phrases, separated by commas."
 msgstr ""
+"ŠšŠ°Ń‚ŠµŠ³Š¾Ń€Šøя ŠæŠ¾Š¼ŠµŃ‚Š¾Šŗ ŠŗŠ½ŠøŠ³Šø.  Š­Ń‚Š¾ ŠæŠ¾Š»Šµ Š¾Š±Ń‹Ń‡Š½Š¾ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся ŠæрŠø ŠæŠ¾ŠøсŠŗŠµ. "
+"<br><br>Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ рŠ°Š·Š“ŠµŠ»Šøть сŠ»Š¾Š²Š° Šø фрŠ°Š·Ń‹ Š·Š°ŠæятыŠ¼Šø."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
-msgstr ""
+msgstr "Š”ŠµŃ€ŠøŠø:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:386
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
-msgstr ""
+msgstr "Š”ŠæŠøсŠ¾Šŗ ŠøŠ·Š²ŠµŃŃ‚Š½Ń‹Ń… сŠµŃ€ŠøŠ¹. Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ Š“Š¾Š±Š¾Š²Š»ŃŃ‚ŃŒ Š½Š¾Š²Ń‹Šµ сŠµŃ€ŠøŠø."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:388
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:389
@@ -2124,23 +2599,23 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:304
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:305
 msgid "Series index."
-msgstr ""
+msgstr "Š£ŠŗŠ°Š·Š°Ń‚ŠµŠ»ŃŒ сŠµŃ€ŠøŠ¹."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:390
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:526
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:306
 msgid "Book "
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Š° "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:392
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:534
 msgid "Source en&coding:"
-msgstr ""
+msgstr "ŠšŠ¾Š“ŠøрŠ¾Š²ŠŗŠ° ŠøстŠ¾Ń‡Š½ŠøŠŗŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:393
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:528
 msgid "Base &font size:"
-msgstr ""
+msgstr "Š Š°Š·Š¼ŠµŃ€ Š¾ŃŠ½Š¾Š²Š½Š¾Š³Š¾ шрŠøфтŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:394
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:400
@@ -2148,47 +2623,47 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:404
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:406
 msgid " pt"
-msgstr ""
+msgstr " тчŠŗ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:395
 msgid "Remove &spacing between paragraphs"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть ŠæрŠ¾Š±ŠµŠ»Ń‹ Š¼ŠµŠ¶Š“у Š°Š±Š·Š°Ń†Š°Š¼Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:396
 msgid "Preserve &tag structure when splitting"
-msgstr ""
+msgstr "Š—Š°Ń„ŠøŠŗсŠøрŠ¾Š²Š°Ń‚ŃŒ струŠŗтуру ŠŗŠ¾Š¼ŠµŠ½Ń‚Š°Ń€ŠøŠµŠ² ŠæрŠø рŠ°Š·Š“ŠµŠ»ŠµŠ½ŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:397
 msgid "Override &CSS"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠ·Š°Š³Ń€ŃƒŠ·Šøть CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:399
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:549
 msgid "&Left Margin:"
-msgstr ""
+msgstr "Š›ŠµŠ²Š°Ń Š“Ń€Š°Š½ŠøцŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:401
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
 msgid "&Right Margin:"
-msgstr ""
+msgstr "ŠŸŃ€Š°Š²Š°Ń Š“Ń€Š°Š½ŠøцŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:403
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:553
 msgid "&Top Margin:"
-msgstr ""
+msgstr "Š’ŠµŃ€Ń…Š½ŃŃ Š“Ń€Š°Š½ŠøцŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:405
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
 msgid "&Bottom Margin:"
-msgstr ""
+msgstr "ŠŠøŠ¶Š½ŃŃ Š“Ń€Š°Š½ŠøцŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:407
 msgid "Automatic &chapter detection"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Š¼Š¾Ń‚ŠøчŠµŃŠŗŠ¾Šµ Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ Š³Š»Š°Š²"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:408
 msgid "&XPath:"
-msgstr ""
+msgstr "XPath:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:409
 msgid ""
@@ -2207,251 +2682,277 @@ msgid ""
 "style=\" text-decoration: underline; color:#0000ff;\">XPath "
 "tutorial</span></a></p></body></html>"
 msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">You can control how "
+"calibre detects chapters using a XPath expression. To learn how to use XPath "
+"expressions see the <a "
+"href=\"https://calibre.kovidgoyal.net/user_manual/xpath.html\"><span "
+"style=\" text-decoration: underline; color:#0000ff;\">XPath "
+"tutorial</span></a></p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:414
 msgid "Chapter &mark:"
-msgstr ""
+msgstr "ŠŸŠ¾Š¼ŠµŃ‚Šøть Š“Š»Š°Š²Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:415
 msgid "Automatic &Table of Contents"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠ¾Šµ ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:416
 msgid "Number of &links to add to Table of Contents"
-msgstr ""
+msgstr "ŠšŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ ссыŠ»Š¾Šŗ Š“Š¾Š±Š°Š²Š»ŃŠµŠ¼Ń‹Ń… Š² ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:417
 msgid "Do not add &detected chapters to the Table of Contents"
-msgstr ""
+msgstr "ŠŠµ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š½Ń‹Šµ Š³Š»Š°Š²Ń‹ Š² ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:418
 msgid "Chapter &threshold"
-msgstr ""
+msgstr "ŠšŠ¾Š½ŠµŃ‡Š½Š°Ń Š“Š»Š°Š²Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:419
 msgid "&Force use of auto-generated Table of Contents"
-msgstr ""
+msgstr "ŠŸŃ€ŠøŠ½ŃƒŠ“ŠøтŠµŠ»ŃŒŠ½Š¾ Š°Š²Ń‚Š¾Š¼Š¾Ń‚ŠøчŠµŃŠŗŠ°Ń Š³ŠµŠ½ŠµŃ€Š°Ń†ŠøŠø ŠžŠ³Š»Š°Š²Š»ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:420
 msgid "Level &1 TOC"
-msgstr ""
+msgstr "Š£Ń€Š¾Š²ŠµŠ½ŃŒ &1 TOC"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:421
 msgid "Level &2 TOC"
-msgstr ""
+msgstr "Š£Ń€Š¾Š²ŠµŠ½ŃŒ &2 TOC"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
 msgid "Author Sort"
-msgstr ""
+msgstr "Š”Š¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠ° ŠæŠ¾ ŠŠ²Ń‚Š¾Ń€Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
 msgid "ISBN"
-msgstr ""
+msgstr "ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
 msgid "Cannot connect"
-msgstr ""
+msgstr "ŠŠµŃ‚ ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
 msgid "You must specify a valid access key for isbndb.com"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š²Š²ŠµŃŃ‚Šø ŠæрŠ°Š²ŠøŠ»ŃŒŠ½Ń‹Š¹ ŠæŠ°Ń€Š¾Š»ŃŒ Š“Š¾ŃŃ‚ŃƒŠæŠ° Š“Š»Ń isbndb.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
 msgid "Error fetching metadata"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° ŠæŠ¾Š»ŃƒŃ‡ŠµŠ½Šøя Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
 msgid "No metadata found"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
 msgid ""
 "No metadata found, try adjusting the title and author or the ISBN key."
 msgstr ""
+"ŠŠµŃ‚ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…, ŠæŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ Š¾Ń‚ŠŗŠ¾Ń€Ń€ŠµŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š·Š°Š³Š»Š°Š²ŠøŠµ Šø Š°Š²Ń‚Š¾Ń€Š° ŠøŠ»Šø ISBN ŠŗŠ»ŃŽŃ‡."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
 msgid "Fetch metadata"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡ŠµŠ½ŠøŠµ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
 msgid "Fetching metadata for <b>%1</b>"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡ŠµŠ½ŠøŠµ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń… Š“Š»Ń <b>%1</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
 msgid ""
 "Sign up for a free account from <a "
 "href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
 msgstr ""
+"Š—Š°Š¹Ń‚Šø ŠæŠ¾Š“ Š³Š¾ŃŃ‚ŠµŠ²Ń‹Š¼ ŠøŠ¼ŠµŠ½ŠµŠ¼ Š² <a href=\"http://www.isbndb.com\">ISBNdb.com</a> "
+"Š“Š»Ń ŠæŠ¾Š»ŃƒŃ‡ŠµŠ½Šøя ŠæŠ°Ń€Š¾Š»Ń Š“Š¾ŃŃ‚ŃƒŠæŠ°."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
 msgid "&Access Key:"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š¾Š»ŃŒ Š“Š¾ŃŃ‚ŃƒŠæŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
 msgid "Fetch"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
 msgid "Matches"
-msgstr ""
+msgstr "Š”Š¾Š²ŠæŠ°Š“ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:83
 msgid ""
 "Select the book that most closely matches your copy from the list below"
-msgstr ""
+msgstr "Š˜Š· сŠæŠøсŠŗŠ° Š²Ń‹Š±ŠµŃ€ŠµŃ‚Šµ ŠŗŠ½ŠøŠ³Ńƒ, ŠŗŠ¾Ń‚Š¾Ń€Š°Ń Š±Š¾Š»ŠµŠµ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŠµŃ‚ Š²Š°ŃˆŠµŠ¹."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:33
 msgid "Details of job"
-msgstr ""
+msgstr "Š Š°Š±Š¾Ń‡ŠµŠµ утŠ¾Ń‡Š½ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:27
 msgid "Unavailable"
-msgstr ""
+msgstr "ŠŠµŠ“Š¾ŃŃ‚ŃƒŠæŠµŠ½"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
 msgid " - Jobs"
-msgstr ""
+msgstr " - Š Š°Š±Š¾Ń‚Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
 msgid "Active Jobs"
-msgstr ""
+msgstr "ŠŠŗтŠøŠ²Š½Ń‹Šµ рŠ°Š±Š¾Ń‚Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
 msgid "&Stop selected job"
-msgstr ""
+msgstr "ŠžŃŃ‚Š°Š½Š¾Š²Šøть Š²Ń‹Š±Ń€Š°Š½Š½ŃƒŃŽ рŠ°Š±Š¾Ń‚Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
 msgid "Choose the format to convert into LRF"
-msgstr ""
+msgstr "Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ фŠ¾Ń€Š¼Š°Ń‚ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя Š² LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
 msgid "Convert %s to LRF"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ %s Š² LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:347
 msgid "Set conversion defaults"
-msgstr ""
+msgstr "Š’ыстŠ°Š²Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:260
 msgid ""
 "Preprocess the file before converting to LRF. This is useful if you know "
 "that the file is from a specific source. Known sources:"
 msgstr ""
+"ŠŸŃ€ŠµŠ“Š²Š°Ń€ŠøтŠµŠ»ŃŒŠ½Š°Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠ° фŠ°Š¹Š»Š° ŠæŠµŃ€ŠµŠ“ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµŠ¼ Š² LRF. Š­Ń‚Š¾ "
+"Š¾ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся, ŠµŃŠ»Šø Š²Ń‹ Š·Š½Š°ŠµŃ‚Šµ ŠøŠ· ŠŗŠ°ŠŗŠ¾Š³Š¾ ŠøстŠ¾Ń‡Š½ŠøŠŗŠ° фŠ°Š¹Š». Š˜ŃŃ‚Š¾Ń‡Š½ŠøŠŗ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
 msgid "<ol><li><b>baen</b> - Books from BAEN Publishers</li>"
-msgstr ""
+msgstr "<ol><li><b>baen</b> - ŠšŠ½ŠøŠ³Š° ŠøŠ· ŠøŠ·Š“Š°Ń‚ŠµŠ»ŃŒŃŃ‚Š²Š° BAEN</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:262
 msgid ""
 "<li><b>pdftohtml</b> - HTML files that are the output of the program "
 "pdftohtml</li>"
-msgstr ""
+msgstr "<li><b>pdftohtml</b> - фŠ°Š¹Š» HTML fрŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚ ŠæрŠ¾Š³Ń€Š°Š¼Š¼Ń‹ pdftohtml</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
 msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
-msgstr ""
+msgstr "<li><b>book-designer</b> - фŠ°Š¹Š» HTML0 ŠøŠ· Book Designer</li>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 msgid ""
 "Specify metadata such as title and author for the book.<p>Metadata will be "
 "updated in the database as well as the generated LRF file."
 msgstr ""
+"ŠŠ°Š·Š½Š°Ń‡Šøть Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ тŠ°ŠŗŠøŠµ, ŠŗŠ°Šŗ Š—Š°Š³Š»Š°Š²ŠøŠµ Šø ŠŠ²Ń‚Š¾Ń€ ŠŗŠ½ŠøŠ³Šø.<p>ŠžŠ±Š½Š¾Š²Š»ŠµŠ½ŠøŠµ "
+"Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń… Š² Š±Š°Š·Šµ Š“Š°Š½Š½Ń‹Ń… Š±ŃƒŠ“ŠµŃ‚ ŠæрŠ¾ŠøŠ·Š²ŠµŠ“ŠµŠ½Š¾ ŠæŠ¾ŃŠ»Šµ усŠæŠµŃˆŠ½Š¾Š³Š¾ сŠ¾Š·Š“Š°Š½Šøя фŠ°Š¹Š»Š° "
+"LRF."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
 msgid ""
 "Adjust the look of the generated LRF file by specifying things like font "
 "sizes and the spacing between words."
 msgstr ""
+"ŠŠ°ŃŃ‚Ń€Š¾Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€ сŠ¾Š·Š“Š°Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø тŠ°ŠŗŠøŠµ, ŠŗŠ°Šŗ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ° Šø "
+"ŠæрŠ¾Š¼ŠµŠ¶ŃƒŃ‚ŠŗŠø Š¼ŠµŠ¶Š“у сŠ»Š¾Š²Š°Š¼Šø."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
 msgid ""
 "Specify the page settings like margins and the screen size of the target "
 "device."
 msgstr ""
+"Š’ыстŠ°Š²Šøть Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø стрŠ°Š½Šøцы тŠ°ŠŗŠøŠµ, ŠŗŠ°Šŗ Š³Ń€Š°Š½Šøцы тŠµŠŗстŠ° Šø рŠ°Š·Š¼ŠµŃ€ эŠŗрŠ°Š½Š° "
+"устрŠ¾Š¹ŃŃ‚Š²Š°."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:308
 msgid "<font color=\"gray\">No help available</font>"
-msgstr ""
+msgstr "<font color=\"gray\">Š”ŠæрŠ°Š²ŠŗŠ° Š½ŠµŠ“Š¾ŃŃ‚ŃƒŠæŠ½Š°</font>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:411
 msgid "Bulk convert ebooks to LRF"
-msgstr ""
+msgstr "ŠžŠ±ŃŠŠµŠ¼ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø Š² LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:503
 msgid "Convert to LRF"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ Š² LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
 msgid "Options"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚ры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:529
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:536
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:538
 msgid " pts"
-msgstr ""
+msgstr " чŠ°ŃŃ‚ŠµŠ¹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:530
 msgid "Embedded Fonts"
-msgstr ""
+msgstr "Š’стŠ°Š²Šøть шрŠøфт"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:531
 msgid "&Serif:"
-msgstr ""
+msgstr "&Serif:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:532
 msgid "S&ans-serif:"
-msgstr ""
+msgstr "S&ans-serif:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:533
 msgid "&Monospace:"
-msgstr ""
+msgstr "&Monospace:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:535
 msgid "Minimum &indent:"
-msgstr ""
+msgstr "ŠœŠøŠ½ŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ Š¾Ń‚ŃŃ‚ŃƒŠæ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:537
 msgid "&Word spacing:"
-msgstr ""
+msgstr "ŠŸŃ€Š¾Š±ŠµŠ» Š¼ŠµŠ¶Š“у сŠ»Š¾Š²Š°Š¼Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
 msgid "Enable auto &rotation of images"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š°Š²Ń‚Š¾Š¼Š¾Ń‚ŠøчŠµŃŠŗŠ¾Šµ рŠ°Š·Š²Š¾Ń€Š°Ń‡ŠøŠ²Š°Š½ŠøŠµ ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
 msgid "Insert &blank lines between paragraphs"
-msgstr ""
+msgstr "Š’стŠ°Š²Šøть Šæустую стрŠ¾Šŗу Š¼ŠµŠ¶Š“у Š°Š±Š·Š°Ń†Š°Š¼Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
 msgid "Ignore &tables"
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŠæустŠøть тŠ°Š±Š»Šøцы"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:542
 msgid "Ignore &colors"
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŠæустŠøть цŠ²ŠµŃ‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:543
 msgid "&Preprocess:"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ“Š²Š°Ń€ŠøтŠµŠ»ŃŒŠ½Š°Ń Š¾Š±Ń€Š°Š±Š¾Ń‚ŠŗŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:544
 msgid "Header"
-msgstr ""
+msgstr "Š“Š»Š°Š²Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:545
 msgid "&Show header"
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ Š³Š»Š°Š²Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:546
 msgid "&Header format:"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:547
 msgid "Override<br>CSS"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠæŠøсŠ°Ń‚ŃŒ<br>CSS"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:552
@@ -2460,59 +2961,60 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:107
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:109
 msgid " px"
-msgstr ""
+msgstr " ŠæŠøŠŗс."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
 msgid "&Convert tables to images (good for large/complex tables)"
 msgstr ""
+"ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ тŠ°Š±Š»Šøцы Š² ŠŗŠ°Ń€Ń‚ŠøŠ½ŠŗŠø (ŠæŠ¾Š»ŠµŠ·Š½Š¾ Š“Š»Ń Š±Š¾Š»ŃŒŃˆŠøх/сŠ»Š¾Š¶Š½Ń‹Ń… тŠ°Š±Š»Šøц)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:558
 msgid "&Multiplier for text size in rendered tables:"
-msgstr ""
+msgstr "ŠšŠ¾ŃŃ„Ń„ŠøцŠøŠµŠ½Ń‚ Š“Š»Ń рŠ°Š·Š¼ŠµŃ€Š° шрŠøфтŠ° ŠæрŠø ŠæŠµŃ€ŠµŃŃ‚Ń€Š¾Š¹ŠŗŠµ тŠ°Š±Š»Šøцы:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:559
 msgid "Title based detection"
-msgstr ""
+msgstr "ŠžŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ Š¾ŃŠ½Š¾Š²Š½Š¾Š³Š¾ Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:560
 msgid "&Disable chapter detection"
-msgstr ""
+msgstr "ŠŠµ рŠ°Š·Ń€ŠµŃˆŠ°Ń‚ŃŒ Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ Š³Š»Š°Š²"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:561
 msgid "&Regular expression:"
-msgstr ""
+msgstr "Š ŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:562
 msgid "Add &chapters to table of contents"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š³Š»Š°Š²Ń‹ Š² ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:563
 msgid "Don't add &links to the table of contents"
-msgstr ""
+msgstr "ŠŠµ Š“Š¾Š±Š°Š²Š»ŃŃ‚ŃŒ ссыŠ»ŠŗŠø Š² ŠžŠ³Š»Š°Š²Š»ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:564
 msgid "Tag based detection"
-msgstr ""
+msgstr "ŠžŠæрŠµŠ“ŠµŠ»ŠµŠ½ŠøŠµ Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ цŠøтŠ°Ń‚Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:565
 msgid "&Page break before tag:"
-msgstr ""
+msgstr "Š Š°Š·Ń€Ń‹Š² стрŠ°Š½Šøцы ŠæŠµŃ€ŠµŠ“ цŠøтŠ°Ń‚Š¾Š¹:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:566
 msgid "&Force page break before tag:"
-msgstr ""
+msgstr "ŠžŠ±ŃŠ·Š°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¹ рŠ°Š·Ń€Ń‹Š² стрŠ°Š½Šøцы ŠæŠµŃ€ŠµŠ“ цŠøтŠ°Ń‚Š¾Š¹:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:567
 msgid "Force page break before &attribute:"
-msgstr ""
+msgstr "ŠžŠ±ŃŠ·Š°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¹ рŠ°Š·Ń€Ń‹Š² стрŠ°Š½Šøцы ŠæŠµŃ€ŠµŠ“ рŠµŠŗŠ²ŠøŠ·ŠøтŠ°Š¼Šø:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:568
 msgid "Detect chapter &at tag:"
-msgstr ""
+msgstr "ŠžŠæрŠµŠ“ŠµŠ»Šøть Š³Š»Š°Š²Ńƒ, ŠŗŠ°Šŗ Š¾ŠæŠøсŠ°Š½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:569
 msgid "Help on item"
-msgstr ""
+msgstr "Š”ŠæрŠ°Š²ŠŗŠ° Š½Š° стŠ°Ń‚ŃŒŃŽ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:570
 msgid ""
@@ -2524,449 +3026,503 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
-msgid "Edit Meta information"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
-msgid "Meta information"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
-msgid "Author S&ort: "
-msgstr ""
+msgid "Edit Meta information"
+msgstr "Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¼ŠµŃ‚Š° ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
+msgid "Meta information"
+msgstr "ŠœŠµŃ‚Š° ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøя"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
+msgid "Author S&ort: "
+msgstr "Š”Š¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠ° ŠæŠ¾ Š°Š²Ń‚Š¾Ń€Ńƒ: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
+"Š’ыстŠ°Š²Šøть, ŠŗŠ°Šŗ Š°Š²Ń‚Š¾Ń€(ы) этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø Š±ŃƒŠ“ут Š¾Ń‚сŠ¾Ń€Ń‚ŠøрŠ¾Š²Š°Š½Ń‹. Š”Š»Ń ŠæрŠøŠ¼ŠµŃ€Š° Š§Š°Ń€Š»ŃŒŠ· "
+"Š”ŠøŠŗŠµŠ½Ń Š±ŃƒŠ“ŠµŃ‚ сŠ¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒŃŃ, ŠŗŠ°Šŗ Š”ŠøŠŗŠµŠ½Ń, Š§Š°Ń€Š»Š·."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
-msgstr ""
+msgstr "ŠžŃ†ŠµŠ½ŠŗŠ°:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
-msgstr ""
+msgstr "ŠžŃ†ŠµŠ½ŠŗŠ° этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø. 0-5 Š·Š²ŠµŠ·Š“ы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
-msgstr ""
+msgstr " Š·Š²ŠµŠ·Š“ы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
-msgstr ""
+msgstr "ŠžŃ‚Šŗрыть рŠµŠ“Š°ŠŗтŠ¾Ń€ Š¾ŠæŠøсŠ°Š½Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
-msgid "Comma separated list of tags to remove from the books. "
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
-msgid "Remove &format:"
-msgstr ""
+msgid "Comma separated list of tags to remove from the books. "
+msgstr "Š—Š°ŠæятŠ°Ń рŠ°Š·Š“ŠµŠ»ŃŠµŃ‚ сŠæŠøсŠ¾Šŗ Š¾ŠæŠøсŠ°Š½ŠøŠ¹ уŠ“Š°Š»ŃŠµŠ¼Ń‹Ń… ŠøŠ· ŠŗŠ½ŠøŠ³Šø. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+msgid "Remove &format:"
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ уŠ“Š°Š»ŠµŠ½Šøя:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr "ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠø Š²Ń‹ŃŃ‚Š°Š²Šøть сŠ¾Ń€Ń‚ŠøрŠ¾Š²Šŗу ŠæŠ¾ Š°Š²Ń‚Š¾Ń€Ńƒ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
+"<p>Š²Š²ŠµŠ“ŠøтŠµ Š²Š°ŃˆŠµ ŠøŠ¼Ń ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»Ń Šø ŠæŠ°Ń€Š¾Š»ŃŒ Š“Š»Ń <b>LibraryThing.com</b>. "
+"<br/>Š•ŃŠ»Šø Š’Ń‹ Šøх Š½Šµ ŠøŠ¼ŠµŠµŃ‚Šµ, Š²Ń‹Š¼Š¾Š¶ŠµŃ‚Šµ Š±ŠµŃŠæŠ»Š°Ń‚Š½Š¾ <a "
+"href='http://www.librarything.com'>Š·Š°Ń€ŠµŠ³ŠøстрŠøрŠ¾Š²Š°Ń‚ŃŒŃŃ</a>.</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
-msgstr ""
+msgstr "<b>ŠŠµ Š¼Š¾Š³Ńƒ ŠæŠ¾Š»ŃƒŃ‡Šøть Š¾Š±Š»Š¾Š¶Šŗу.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
-msgstr ""
+msgstr "ŠŠµ сŠ¼Š¾Š³Ńƒ ŠæŠ¾Š»ŃƒŃ‡Šøть Š¾Š±Š»Š¾Š¶Šŗу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ ŠæŠ¾Š»ŃƒŃ‡Šøть Š¾Š±Š»Š¾Š¶Šŗу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š½Š°Š·Š½Š°Ń‡Šøть ISBN ŠøŠ“ŠµŠ½Ń‚ŠøфŠøŠŗŠ°Ń‚Š¾Ń€ Š“Š»Ń этŠ¾Š¹ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:277
 msgid "Edit Meta Information"
-msgstr ""
+msgstr "Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Š½ŠøŠµ Š¼ŠµŃ‚Š° ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†ŠøŠø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:281
 msgid "Swap the author and title"
-msgstr ""
+msgstr "Š—Š°Š¼ŠµŠ½Šøть ŠŠ²Ń‚Š¾Ń€Š° Šø Š—Š°Š³Š»Š°Š²ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:287
 msgid ""
 "Automatically create the author sort entry based on the current author entry"
 msgstr ""
+"ŠŠ²Ń‚Š¾Š¼Š°Ń‚ŠøчŠµŃŠŗŠ¾Šµ сŠ¾Š·Š“Š°Š½ŠøŠµ сŠ¾Ń€Ń‚ŠøрŠ¾Š²ŠŗŠ° ŠæŠ¾ Š°Š²Ń‚Š¾Ń€Ńƒ Š¾ŃŠ½Š¾Š²Š°Š½Š½Š¾Šµ Š½Š° Š“Š¾ŠæŠ¾Š»Š½ŠøтŠµŠ»ŃŒŠ½Š¾ "
+"Š²Š²ŠµŠ“ŠµŠ½Š¾Š¼ Š°Š²Ń‚Š¾Ń€Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:302
 msgid "Remove unused series (Series that have no books)"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть Š½ŠµŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼ŃƒŃŽ сŠµŃ€Šøю (Š’ сŠµŃ€ŠøŠø Š½ŠµŃ‚ ŠŗŠ½ŠøŠ³)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:307
 msgid "IS&BN:"
-msgstr ""
+msgstr "ISBN"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:309
 msgid "Fetch metadata from server"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ с сŠµŃ€Š²ŠµŃ€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:310
 msgid "Available Formats"
-msgstr ""
+msgstr "Š”Š¾ŃŃ‚ŃƒŠæŠ½Ń‹Šµ &фŠ¾Ń€Š¼Š°Ń‚Ń‹:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:311
 msgid "Add a new format for this book to the database"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š½Š¾Š²Ń‹Šµ фŠ¾Ń€Š¼Š°Ń‚Ń‹ ŠŗŠ½ŠøŠ³Šø Š² Š±Š°Š·Ńƒ Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:313
 msgid "Remove the selected formats for this book from the database."
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть Š²Ń‹Š±Ń€Š°Š½Š½Ń‹Šµ фŠ¾Ń€Š¼Š°Ń‚Ń‹ ŠŗŠ½ŠøŠ³Šø ŠøŠ· Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:319
 msgid "Reset cover to default"
-msgstr ""
+msgstr "Š”Š±Ń€Š¾ŃŠøть Š¾Š±Š»Š¾Š¶Šŗу Š½Š° \"ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю\""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:321
 msgid "Fetch cover image from server"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть ŠøŠ·Š¾Š±Ń€Š°Š¶ŠµŠ½ŠøŠµ Š¾Š±Š»Š¾Š¶ŠŗŠø с сŠµŃ€Š²ŠµŃ€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:322
 msgid ""
 "Change the username and/or password for your account at LibraryThing.com"
 msgstr ""
+"Š”Š¼ŠµŠ½Šøть ŠøŠ¼Ń ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»Ń Šø/ŠøŠ»Šø ŠæŠ°Ń€Š¾Š»ŃŒ Š“Š»Ń Š²Š°ŃˆŠøх Š“Š°Š½Š½Ń‹Ń… Š½Š° LibraryThing.com"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:323
 msgid "Change password"
-msgstr ""
+msgstr "Š˜Š·Š¼ŠµŠ½Šøть ŠæŠ°Ń€Š¾Š»ŃŒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
 msgid "Password needed"
-msgstr ""
+msgstr "ŠŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼ ŠæŠ°Ń€Š¾Š»ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr "Š’Ń‹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
-msgstr ""
+msgstr "ŠŠ°Š¹Ń‚Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr "%d Š½Š°Š±Š¾Ń€ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š²"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š²Š²ŠµŃŃ‚Šø сŠ²Š¾Šø Š»Š¾Š³ŠøŠ½ Šø ŠæŠ°Ń€Š¾Š»ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚Ń€Ńƒ трŠµŠ±ŃƒŠµŃ‚ся Š»Š¾Š³ŠøŠ½ Šø ŠæŠ°Ń€Š¾Š»ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr "Š”Š¾Š·Š“Š°Š½Š¾: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
-msgstr ""
+msgstr "ŠŸŠ¾ŃŠ»ŠµŠ“Š½ŠøŠ¹ рŠ°Š· сŠŗŠ°Ń‡Š°Š½Š¾: %s Š“Š½ŠµŠ¹ тŠ¾Š¼Ńƒ Š½Š°Š·Š°Š“"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
-msgid "Schedule news download"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
-msgid "Add a custom news source"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
-msgid "News"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
-msgid "Recipes"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
-msgid "Schedule for download"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
-msgid "title"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
-msgid "description"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
-msgid "&Schedule for download every:"
-msgstr ""
+msgstr "ŠŸŠ¾ŃŠ»ŠµŠ“Š½ŃŃ Š·Š°ŠŗŠ°Ń‡ŠŗŠ°: Š½ŠøŠŗŠ¾Š³Š“Š°"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+msgid "Schedule news download"
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ° Š½Š¾Š²Š¾ŃŃ‚ŠµŠ¹ ŠæŠ¾ рŠ°ŃŠæŠøсŠ°Š½Šøю"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
+msgid "Add a custom news source"
+msgstr "Š”Š¾Š±Š°Š²Šøть Š½ŃƒŠ¶Š½Ń‹Š¹ ŠøстŠ¾Ń‡Š½ŠøŠŗ Š½Š¾Š²Š¾ŃŃ‚ŠµŠ¹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
+msgid "News"
+msgstr "ŠŠ¾Š²Š¾ŃŃ‚Šø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
+msgid "Recipes"
+msgstr "Š”Š¾ŃŃ‚Š°Š²"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+msgid "Schedule for download"
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ° ŠæŠ¾ Š²Ń€ŠµŠ¼ŠµŠ½Šø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+msgid "title"
+msgstr "Š½Š°Š·Š²Š°Š½ŠøŠµ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+msgid "description"
+msgstr "Š¾ŠæŠøсŠ°Š½ŠøŠµ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr "Š°Š²Ń‚Š¾Ń€"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+msgid "&Schedule for download every:"
+msgstr "Š—Š°Š³Ń€ŃƒŠ¶Š°Ń‚ŃŒ ŠæŠ¾ рŠ°ŃŠæŠøсŠ°Š½Šøю ŠŗŠ°Š¶Š“ыŠ¹:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
-msgid " days"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
-msgid "&Account"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
-msgid "For the scheduling to work, you must leave calibre running."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
-msgid "&Download now"
-msgstr ""
+"ŠŸŃ€Š¾Š¼ŠµŠ¶ŃƒŃ‚Š¾Šŗ Š² ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ Š±ŃƒŠ“ŠµŃ‚ Š·Š°Š³Ń€ŃƒŠ¶Š°Ń‚ŃŒŃŃ этŠ¾Ń‚ Š½Š°Š±Š¾Ń€. Š—Š½Š°Ń‡ŠµŠ½ŠøŠµ Š½Š¾Š»ŃŒ "
+"ŠæŠ¾Š“рŠ°Š·ŃƒŠ¼ŠµŠ²Š°ŠµŃ‚ Š·Š°Š³Ń€ŃƒŠ·Šŗу ŠŗŠ°Š¶Š“ыŠ¹ чŠ°Ń."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
+msgid " days"
+msgstr " Š“Š½Šø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+msgid "&Account"
+msgstr "&Š£Ń‡Ń‘Ń‚Š½Š°Ń Š·Š°ŠæŠøсь"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
+msgid "For the scheduling to work, you must leave calibre running."
+msgstr "Š”Š»Ń рŠ°Š±Š¾Ń‚Ń‹ ŠæŠ¾ рŠ°ŃŃŠæŠøсŠ°Š½Šøю, Š²Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š·Š°Š³Ń€ŃƒŠ·Šøть calibre."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
+msgid "&Download now"
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть сŠµŠ¹Ń‡Š°Ń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
+"Š£Š“Š°Š»Šøть Š·Š°Š³Ń€ŃƒŠ¶ŠµŠ½Š½Ń‹Šµ Š½Š¾Š²Š¾ŃŃ‚Šø, устŠ°Ń€ŠµŠ²ŃˆŠøŠµ чŠµŃ€ŠµŠ· устŠ°Š½Š¾Š²Š»ŠµŠ½Š½Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ Š“Š½ŠµŠ¹. "
+"Š”Š»Ń Š±Š»Š¾ŠŗŠøрŠ¾Š²Š°Š½Šøя устŠ°Š½Š¾Š²ŠøтŠµ Š½Š¾Š»ŃŒ."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть Š·Š°ŠŗŠ°Ń‡ŠµŠ½Š½Ń‹Šµ Š½Š¾Š²Š¾ŃŃ‚Šø стŠ°Ń€ŃˆŠµ, чŠµŠ¼ "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
 msgid "Form"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
 msgid "contains"
-msgstr ""
+msgstr "сŠ¾Š“ŠµŃ€Š¶Šøт"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
 msgid "The text to search for. It is interpreted as a regular expression."
-msgstr ""
+msgstr "Š”трŠ¾ŠŗŠ° Š“Š»Ń ŠæŠ¾ŠøсŠŗŠ°. ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·ŃƒŠµŃ‚ся, ŠŗŠ°Šŗ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
 msgid ""
 "<p>Negate this match. That is, only return results that <b>do not</b> match "
 "this query."
 msgstr ""
+"<p>ŠžŃ‚Ń€ŠøцŠ°Ń‚ŠµŠ»ŃŒŠ½Š¾Šµ Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ. Š§Ń‚Š¾ Š±Ń‹ ŠæŠ¾Š»ŃƒŃ‡Šøть рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚ <b>Š½Šµ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ</b> "
+"Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ этŠ¾Š³Š¾ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøя."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
 msgid "Negate"
-msgstr ""
+msgstr "Š˜ŃŠŗŠ»ŃŽŃ‡Šøть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:87
 msgid "Advanced Search"
-msgstr ""
+msgstr "Š Š°ŃŃˆŠøрŠµŠ½Š½Ń‹Š¹ ŠæŠ¾ŠøсŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
 msgid "Find entries that have..."
-msgstr ""
+msgstr "Š˜Ń‰ŠµŃ‚ся Š²Š²ŠµŠ“ŠµŠ½Š¾Šµ Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:89
 msgid "&All these words:"
-msgstr ""
+msgstr "Š’сŠµ этŠø сŠ»Š¾Š²Š°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:90
 msgid "This exact &phrase:"
-msgstr ""
+msgstr "Š¢Ń€ŠµŠ±ŃƒŠµŃ‚ся фрŠ°Š·Š°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:91
 msgid "&One or more of these words:"
-msgstr ""
+msgstr "ŠžŠ“Š½Š¾ ŠøŠ»Šø Š±Š¾Š»ŠµŠµ ŠøŠ· сŠ»Š¾Š²:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:92
 msgid "But dont show entries that have..."
-msgstr ""
+msgstr "ŠŠ¾ Š½Šµ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š²Š²ŠµŠ“ŠµŠ½Ń‹Šµ Š“Š°Š½Š½Ń‹Šµ..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:93
 msgid "Any of these &unwanted words:"
-msgstr ""
+msgstr "Š›ŃŽŠ±Ń‹Šµ ŠøŠ· этŠøх Š½Š°Š¹Š“ŠµŠ½Š½Ń‹Ń… сŠ»Š¾Š²:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:94
 msgid ""
 "See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
 "search-interface\">User Manual</a> for more help"
 msgstr ""
+"Š”Š»Ń ŠæŠ¾Š»ŃƒŃ‡ŠµŠ½Šøя сŠæрŠ°Š²ŠŗŠø, сŠ¼Š¾Ń‚Ń€Šø Š½Š° сŠ°Š¹Ń‚Šµ <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-search-"
+"interface\">User Manual</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
 msgid "Tag Editor"
-msgstr ""
+msgstr "Š ŠµŠ“Š°ŠŗтŠ¾Ń€ Š¾ŠæŠøсŠ°Š½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
 msgid "A&vailable tags"
-msgstr ""
+msgstr "Š”Š¾ŃŃ‚ŃƒŠæŠ½Ń‹Šµ Š¾ŠæŠøсŠ°Š½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
 msgid ""
 "Delete tag from database. This will unapply the tag from all books and then "
 "remove it from the database."
 msgstr ""
+"Š£Š“Š°Š»Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ ŠøŠ· Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…. ŠžŠæŠøсŠ°Š½ŠøŠµ Š½Šµ Š±ŃƒŠ“ŠµŃ‚ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒŃŃ Š“Š»Ń Š²ŃŠµŃ… "
+"ŠŗŠ½ŠøŠ³ Šø Š±ŃƒŠ“ŠµŃ‚ уŠ“Š°Š»ŠµŠ½Š¾ ŠøŠ· Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
 msgid "Apply tag to current book"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ Šŗ тŠµŠŗущŠµŠ¹ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
 msgid "A&pplied tags"
-msgstr ""
+msgstr "ŠŸŃ€ŠøŠ¼ŠµŠ½Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
 msgid "Unapply (remove) tag from current book"
-msgstr ""
+msgstr "ŠŠµŠæрŠøŠ¼ŠµŠ½ŃŃ‚ŃŒ (уŠ“Š°Š»Šøть) Š¾ŠæŠøсŠ°Š½ŠøŠµ ŠøŠ· тŠµŠŗущŠµŠ¹ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
 msgid "&Add tag:"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
 msgid ""
 "If the tag you want is not in the available list, you can add it here. "
 "Accepts a comma separated list of tags."
 msgstr ""
+"Š•ŃŠ»Šø Š¾ŠæŠøсŠ°Š½ŠøŠµ, ŠŗŠ¾Ń‚Š¾Ń€Š¾Šµ Š’Ń‹ хŠ¾Ń‚ŠøтŠµ Š“Š¾Š±Š°Š²Šøть Š½Šµ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾ ŠøŠ· сŠæŠøсŠŗŠ°, Š’Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ "
+"ŠµŠ³Š¾ Š“Š¾Š±Š°Š²Šøть Š·Š“ŠµŃŃŒ. Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠ¹Ń‚Šµ Š·Š°Šæятую Š“Š»Ń рŠ°Š·Š“ŠµŠ»ŠµŠ½Šøя сŠæŠøсŠŗŠ°  Š¾ŠæŠøсŠ°Š½ŠøŠ¹."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
 msgid "Add tag to available tags and apply it to current book"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š¾ŠæŠøсŠ°Š½ŠøŠµ Š² Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾Šµ Šø ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠµŠ³Š¾ Š² тŠµŠŗущŠµŠ¹ ŠŗŠ½ŠøŠ³Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:63
 msgid "No recipe selected"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š²Ń‹Š±Ń€Š°Š½Š½Ń‹Ń… ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š²"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
 msgid "The attached file: %s is a recipe to download %s."
-msgstr ""
+msgstr "ŠŸŃ€ŠøсŠ¾ŠµŠ“ŠøŠ½ŠµŠ½Š½Ń‹Š¹ фŠ°Š¹Š»: %s ŠŗŠ°Šŗ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ Š·Š°Š³Ń€ŃƒŠ¶Š°ŠµŠ¼Ń‹Š¹ %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:70
 msgid "Recipe for "
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚ры Š“Š»Ń "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:86
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:97
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:221
 msgid "Switch to Advanced mode"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠŗŠ»ŃŽŃ‡Šøться Š² рŠ°ŃŃˆŠøрŠµŠ½Š½Ń‹Š¹ рŠµŠ¶ŠøŠ¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:92
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:100
 msgid "Switch to Basic mode"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠŗŠ»ŃŽŃ‡Šøться Š² Š¾Š±Ń‹Ń‡Š½Ń‹Š¹ рŠµŠ¶ŠøŠ¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:110
 msgid "Feed must have a title"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ Š“Š¾Š»Š¶Š½Š¾ Š±Ń‹Ń‚ŃŒ Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:111
 msgid "The feed must have a title"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ Š“Š¾Š»Š¶Š½Š¾ Š±Ń‹Ń‚ŃŒ Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:115
 msgid "Feed must have a URL"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ Š“Š¾Š»Š¶Š½Š¾ ŠøŠ¼ŠµŃ‚ŃŒ URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:116
 msgid "The feed %s must have a URL"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ %s Š“Š¾Š»Š¶Š½Š¾ ŠøŠ¼ŠµŃ‚ŃŒ URL"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:121
 msgid "Already exists"
-msgstr ""
+msgstr "Š£Š¶Šµ сущŠµŃŃ‚Š²ŃƒŠµŃ‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:122
 msgid "This feed has already been added to the recipe"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ уŠ¶Šµ Š±Ń‹Š»Š¾ Š“Š¾Š±Š°Š²Š»ŠµŠ½Š¾ Š² ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
-msgstr ""
+msgstr "ŠŠµŠ²ŠµŃ€Š½Š¾Šµ Š·Š½Š°Ń‡ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
-msgstr ""
+msgstr "<p>ŠŠµ Š¼Š¾Š³Ńƒ сŠ¾Š·Š“Š°Ń‚ŃŒ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€. ŠžŃˆŠøŠ±ŠŗŠ°:<br> %s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
-msgid "Replace recipe?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+msgid "Replace recipe?"
+msgstr "Š—Š°Š¼ŠµŠ½Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Š½Š½Š¾Šµ ŠøŠ¼Ń ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š° %s уŠ¶Šµ сущŠµŃŃ‚Š²ŃƒŠµŃ‚. Š„Š¾Ń‚ŠøтŠµ Š·Š°Š¼ŠµŠ½Šøть ŠµŠ³Š¾?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:202
 msgid "Pick recipe"
-msgstr ""
+msgstr "ŠŸŠ¾Š“Š¾Š±Ń€Š°Ń‚ŃŒ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:202
 msgid "Pick the recipe to customize"
-msgstr ""
+msgstr "ŠŸŠ¾Š“Š¾Š±Ń€Š°Ń‚ŃŒ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ Š²Ń‹Š±Š¾Ń€Š¾Ń‡Š½Š¾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ фŠ°Š¹Š» ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:214
 msgid "Add custom news source"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть  ŠøстŠ¾Ń‡Š½ŠøŠŗ Š½Š¾Š²Š¾ŃŃ‚ŠµŠ¹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:215
 msgid "Available user recipes"
-msgstr ""
+msgstr "Š”Š¾ŃŃ‚ŃƒŠæŠ½Ń‹Šµ ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŽ ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:216
 msgid "Add/Update &recipe"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть/ŠžŠ±Š½Š¾Š²Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:217
 msgid "&Remove recipe"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚ры"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:218
 msgid "&Share recipe"
-msgstr ""
+msgstr "Š”Š¾Š²Š¼ŠµŃŃ‚Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:219
 msgid "Customize &builtin recipe"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Šøть Š²ŃŃ‚Ń€Š¾ŠµŠ½Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:220
 msgid "&Load recipe from file"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ ŠøŠ· фŠ°Š¹Š»Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:222
 msgid ""
@@ -2981,61 +3537,74 @@ msgid ""
 "use the \"Advanced mode\" to further customize the fetch "
 "process.</p></body></html>"
 msgstr ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Š”Š¾Š·Š“Š°Š¹Ń‚Šµ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ Š¾ŃŠ½Š¾Š²Š½Ń‹Ń… "
+"Š½Š¾Š²Š¾ŃŃ‚ŠµŠ¹, Š“Š¾Š±Š°Š²Š»ŃŠµŠ¼Ń‹Ń… Š² RSS Š»ŠµŠ½Ń‚Ńƒ.<br />Š”Š»Ń Š±Š¾Š»ŃŒŃˆŠøŠ½ŃŃ‚Š²Š° Š»ŠµŠ½Ń‚, Š²Ń‹ Š¼Š¾Š¶ŠµŃ‚Šµ "
+"ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š“Š»Ń ŠæрŠ¾ŃŠµŃŃŠ° Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø \"Š Š°ŃŃˆŠøрŠµŠ½Š½Ń‹Š¹ рŠµŠ¶ŠøŠ¼\".</p></body></html>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:226
 msgid "Recipe &title:"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚Ń€ Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:227
 msgid "&Oldest article:"
-msgstr ""
+msgstr "Š”тŠ°Ń€Š°Ń стŠ°Ń‚ŃŒŃ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:228
 msgid "The oldest article to download"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ¶ŠµŠ½Š° стŠ°Ń€Š°Ń стŠ°Ń‚ŃŒŃ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:230
 msgid "&Max. number of articles per feed:"
-msgstr ""
+msgstr "ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ стŠ°Ń‚ŠµŠ¹ Š² Š»ŠµŠ½Ń‚Šµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:231
 msgid "Maximum number of articles to download per feed."
-msgstr ""
+msgstr "ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ стŠ°Ń‚ŠµŠ¹ Š·Š°Š³Ń€ŃƒŠ¶Š°ŠµŠ¼Ń‹Ń… Š² Š»ŠµŠ½Ń‚Ńƒ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:232
 msgid "Feeds in recipe"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Ń Š² ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:234
 msgid "Remove feed from recipe"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть ŠæŠ¾Š»Šµ ŠøŠ· ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:237
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:240
 msgid "Add feed to recipe"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть ŠæŠ¾Š»Šµ Š² ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:238
 msgid "&Feed title:"
-msgstr ""
+msgstr "ŠŸŠ¾Š»Šµ Š·Š°Š³Š»Š°Š²Šøя:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:239
 msgid "Feed &URL:"
-msgstr ""
+msgstr "&ŠŠ“рŠµŃ Š»ŠµŠ½Ń‚Ń‹ Š½Š¾Š²Š¾ŃŃ‚ŠµŠ¹:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:241
 msgid "&Add feed"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š»ŠµŠ½Ń‚Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:242
 msgid ""
 "For help with writing advanced news recipes, please visit <a "
 "href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
 msgstr ""
+"Š”Š»Ń сŠæрŠ°Š²ŠŗŠø ŠæŠ¾ Š·Š°ŠæŠøсŠø рŠ°ŃŃˆŠøрŠµŠ½Š½Š¾Š³Š¾ Š½Š¾Š²Š¾ŃŃ‚Š½Š¾Š³Š¾ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š°, ŠæŠ¾Š¶Š°Š»ŃƒŃŃ‚Š° ŠæрŠ¾Š¹Š“ŠøтŠµ "
+"ŠæŠ¾ ссыŠ»ŠŗŠµ <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">ŠŸŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŒŃŠŗŠøŠµ"
+" ŠŸŠ°Ń€Š°Š¼ŠµŃ‚ры</a>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:243
 msgid "Recipe source code (python)"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚Ń€ ŠŗŠ¾Š“Š° ŠøстŠ¾Ń‡Š½ŠøŠŗŠ° (python)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97
 msgid ""
@@ -3063,27 +3632,27 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104
 msgid "Regular &expression"
-msgstr ""
+msgstr "Š ŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ &Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105
 msgid "&Test"
-msgstr ""
+msgstr "&Š¢ŠµŃŃ‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
 msgid "File &name:"
-msgstr ""
+msgstr "&Š˜Š¼Ń фŠ°Š¹Š»Š°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
 msgid "Test"
-msgstr ""
+msgstr "Š¢ŠµŃŃ‚"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108
 msgid "Title:"
-msgstr ""
+msgstr "ŠŠ°Š·Š²Š°Š½ŠøŠµ:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109
 msgid "Regular expression (?P&lt;title&gt;)"
-msgstr ""
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ (?P&lt;title&gt;)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:113
@@ -3096,335 +3665,355 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
 msgid "No match"
-msgstr ""
+msgstr "ŠŠµŃ‚ сŠ¾Š²ŠæŠ°Š“ŠµŠ½ŠøŠ¹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111
 msgid "Authors:"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Ń€Ń‹:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112
 msgid "Regular expression (?P<authors>)"
-msgstr ""
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ (?P<authors>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
 msgid "Series:"
-msgstr ""
+msgstr "Š”ŠµŃ€Šøя:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
 msgid "Regular expression (?P<series>)"
-msgstr ""
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ (?P<series>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
 msgid "Series index:"
-msgstr ""
+msgstr "Š˜Š½Š“ŠµŠŗс сŠµŃ€ŠøŠø:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
 msgid "Regular expression (?P<series_index>)"
-msgstr ""
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ (?P<series_index>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
 msgid "ISBN:"
-msgstr ""
+msgstr "ISBN:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
 msgid "Regular expression (?P<isbn>)"
-msgstr ""
+msgstr "ŠžŠ±Ń‹Ń‡Š½Ń‹Š¹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€ (?P<isbn>)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:46
 msgid "Job"
-msgstr ""
+msgstr "Š—Š°Š“Š°Š½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
 msgid "Status"
-msgstr ""
+msgstr "Š”тŠ°Ń‚ŃƒŃ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
 msgid "Progress"
-msgstr ""
+msgstr "Š„Š¾Š“ Š²Ń‹ŠæŠ¾Š»Š½ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:49
 msgid "Running time"
-msgstr ""
+msgstr "Š Š°Š±Š¾Ń‡ŠµŠµ Š²Ń€ŠµŠ¼Ń"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:65
 msgid "Unknown job"
-msgstr ""
+msgstr "ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Š°Ń рŠ°Š±Š¾Ń‚Š°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:70
 msgid "Finished"
-msgstr ""
+msgstr "Š—Š°ŠŗŠ¾Š½Ń‡ŠøŠ»"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
 msgid "Error"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
 msgid "Waiting"
-msgstr ""
+msgstr "Š–Š“ŠøтŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:76
 msgid "Working"
-msgstr ""
+msgstr "Š Š°Š±Š¾Ń‚Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
-msgstr ""
+msgstr "ŠŠµŠ¼Š¾Š³Ńƒ уŠ“Š°Š»Šøть Š·Š°Š“Š°Š½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
-msgstr ""
+msgstr "ŠŠµŠ¼Š¾Š³Ńƒ уŠ“Š°Š»Šøть Š·Š°Š“Š°Š½ŠøŠµ ŠæрŠø ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Š½Š¾Š¼ устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
-msgid "Size (MB)"
-msgstr ""
+msgstr "Š—Š°Š“Š°Š½ŠøŠµ уŠ¶Šµ Š·Š°ŠæущŠµŠ½Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
-msgid "Date"
-msgstr ""
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
+msgid "Size (MB)"
+msgstr "Š Š°Š·Š¼ŠµŃ€ (ŠœŠ‘)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
+msgid "Date"
+msgstr "Š”Š°Ń‚Š°"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
-msgstr ""
+msgstr "Š ŠµŠ¹Ń‚ŠøŠ½Š³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
-msgstr ""
+msgstr "ŠŠøчŠµŠ³Š¾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr "ŠšŠ½ŠøŠ³Š° <font face=\"serif\">%s</font> ŠøŠ· %s."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
-msgstr ""
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
-msgstr ""
+msgstr "Š’Ń€ŠµŠ¼ŠµŠ½Š½Š°Ń Š¼ŠµŃ‚ŠŗŠ°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
-msgstr ""
+msgstr "ŠŸŠ¾ŠøсŠŗ (Š“Š»Ń рŠ°ŃŃˆŠøрŠµŠ½Š½Š¾Š³Š¾ ŠæŠ¾ŠøсŠŗŠ° Š½Š°Š¶Š¼ŠøтŠµ ŠŗŠ½Š¾ŠæŠŗу сŠ»ŠµŠ²Š°)"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
 msgid "Configure Viewer"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠ° ŠæрŠ¾ŃŠ¼Š°Ń‚Ń€Š¾Š²Ń‰ŠøŠŗŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
 msgid "Use white background"
-msgstr ""
+msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ Š±ŠµŠ»Ń‹Š¹ фŠ¾Š½"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
 msgid "Hyphenate"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠ½ŠµŃŃ‚Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
 msgid "<b>Changes will only take effect after a restart.</b>"
-msgstr ""
+msgstr "<b>Š˜Š·Š¼ŠµŠ½ŠµŠ½Šøя ŠæрŠøŠ¼ŠµŠ½ŃŃ‚ся тŠ¾Š»ŃŒŠŗŠ¾ ŠæŠ¾ŃŠ»Šµ ŠæŠµŃ€ŠµŠ·Š°Š³Ń€ŃƒŠ·ŠŗŠø.</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:64
 msgid " - LRF Viewer"
-msgstr ""
+msgstr " - LRF ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š¾Š²Ń‰ŠøŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
 msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
-msgstr ""
+msgstr "<b>ŠŠµŃ‚ сŠ¾Š²ŠæŠ°Š“ŠµŠ½ŠøŠ¹</b> Š“Š»Ń ŠøсŠŗŠ¾Š¼Š¾Š¹ фрŠ°Š·Ń‹ <i>%s</i> ."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
-msgstr ""
+msgstr "Š”Š¾Š²ŠæŠ°Š“ŠµŠ½ŠøŠ¹ Š½Šµ Š½Š°Š¹Š“ŠµŠ½Š¾"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
 msgid "LRF Viewer"
-msgstr ""
+msgstr "LRF ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š¾Š²Ń‰ŠøŠŗ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
 msgid "Parsing LRF file"
-msgstr ""
+msgstr "Š Š°Š·Š±Š¾Ń€ фŠ°Š¹Š»Š° LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
 msgid "LRF Viewer toolbar"
-msgstr ""
+msgstr "ŠŸŠ°Š½ŠµŠ»ŃŒ ŠæрŠ¾Š¼Š¾Ń‚Ń€Š° LRF"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
 msgid "Next Page"
-msgstr ""
+msgstr "Š”Š»ŠµŠ“ующŠ°Ń стрŠ°Š½ŠøцŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
 msgid "Previous Page"
-msgstr ""
+msgstr "ŠŸŃ€ŠµŠ“ыŠ“ущŠ°Ń стрŠ°Š½ŠøцŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
-msgstr ""
+msgstr "ŠŠ°Š·Š°Š“"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
-msgstr ""
+msgstr "Š’ŠæŠµŃ€ŠµŠ“"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
 msgid "Next match"
-msgstr ""
+msgstr "Š”Š»ŠµŠ“ующŠøŠ¹ ŠæŠ¾Š“Š±Š¾Ń€"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
-msgstr ""
+msgstr "ŠžŃ‚Šŗрыть ŠŗŠ½ŠøŠ³Ńƒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
 msgid "Configure"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Šøть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
-msgid "&Restore"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° ŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Šøя с устрŠ¾Š¹ŃŃ‚Š²Š¾Š¼"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
-msgid "&Donate"
-msgstr ""
+msgid "&Restore"
+msgstr "Š’Š¾ŃŃŃ‚Š°Š½Š¾Š²Šøть"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
-msgid "&Quit"
-msgstr ""
+msgid "&Donate"
+msgstr "Š’Š¾Š·Š½Š°Š³Ń€Š°Š“Šøть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+msgid "&Quit"
+msgstr "&Š’Ń‹Ń…Š¾Š“"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr "&ŠŸŠµŃ€ŠµŠ·Š°ŠæусŠŗ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
+"<p>Š”Š»Ń сŠæрŠ°Š²ŠŗŠø ŠæŠ¾ŃŠµŃ‚ŠøтŠµ <a "
+"href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
-msgstr ""
+msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
-msgstr ""
+msgstr "ŠžŃ‚ŠæрŠ°Š²Šøть Š² Š¾ŃŠ½Š¾Š²Š½ŃƒŃŽ ŠæŠ°Š¼ŃŃ‚ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
-msgstr ""
+msgstr "ŠžŃ‚ŠæрŠ°Š²Šøть Š² ŠŗŠ°Ń€Ń‚Ńƒ ŠæŠ°Š¼ŃŃ‚Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
-msgstr ""
+msgstr "Šø уŠ“Š°Š»ŠøтŠµ ŠøŠ· Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
-msgid "Edit metadata individually"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
-msgid "Edit metadata in bulk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
-msgid "Add books from a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
-msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
-msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
-msgid "Save to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
-msgid "Save to disk in a single directory"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
-msgid "Save only %s format to disk"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
-msgid "View"
-msgstr ""
+msgstr "ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š¾Ń‚ŠæрŠ°Š²Š»ŃŃ‚ŃŒ Š² ŠŗŠ°Ń€Ń‚Ńƒ ŠæŠ°Š¼ŃŃ‚Šø"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+msgid "Edit metadata individually"
+msgstr "Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ ŠøŠ½Š“ŠøŠ²ŠøŠ“уŠ°Š»ŃŒŠ½Š¾"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+msgid "Edit metadata in bulk"
+msgstr "Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¾ŃŠ½Š¾Š²Š½Ń‹Šµ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
+msgid "Add books from a single directory"
+msgstr "Š”Š¾Š±Š°Š²Šøть ŠŗŠ½ŠøŠ³Šø ŠøŠ· Š¾Š“Š½Š¾Š¹ Š“ŠøрŠµŠŗтŠ¾Ń€ŠøŠø"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+msgid "Save to disk"
+msgstr "Š”Š¾Ń…Ń€Š°Š½Šøть Š½Š° Š“ŠøсŠŗ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
+msgid "Save to disk in a single directory"
+msgstr "Š”Š¾Ń…Ń€Š°Š½Šøть Š½Š° Š“ŠøсŠŗ Š² Š¾Š“Š½Ńƒ Š“ŠøрŠµŠŗтŠ¾Ń€Šøю"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
+msgid "Save only %s format to disk"
+msgstr "Š”Š¾Ń…Ń€Š°Š½ŃŃ‚ŃŒ Š½Š° Š“ŠøсŠŗ тŠ¾Š»ŃŒŠŗŠ¾ фŠ¾Ń€Š¼Š°Ń‚ %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
+msgid "View"
+msgstr "Š’ŠøŠ“"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
-msgstr ""
+msgstr "ŠŸŃ€Š¾ŃŠ¼Š¾Ń‚Ń€ŠµŃ‚ŃŒ Š¾ŃŠ¾Š±Ń‹Š¹ фŠ¾Ń€Š¼Š°Ń‚"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
-msgstr ""
+msgstr "Š˜Š½Š“ŠøŠ²ŠøŠ“уŠ°Š»ŃŒŠ½Š¾Šµ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
-msgstr ""
+msgstr "ŠžŠ±Ń‰ŠµŠµ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠø ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š“Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠø ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š“Š»Ń ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя ŠŗŠ¾Š¼ŠøŠŗсŠ¾Š²"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
-msgstr ""
+msgstr "ŠŸŠ»Š¾Ń…Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€ŠµŃ€ŠµŃ‚Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š’Š°ŃˆŠµŠ¹ Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø эŠ»ŠµŠŗтрŠ¾Š½Š½Ń‹Ń… ŠŗŠ½ŠøŠ³."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠ¼ŠµŃ‰ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
-msgstr ""
+msgstr "Š£ŃŃ‚Ń€Š¾Š¹ŃŃ‚Š²Š¾: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
-msgstr ""
+msgstr " Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Š¾."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
-msgstr ""
+msgstr "ŠŸŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠµŠ½Š¾ "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
-msgstr ""
+msgstr "Š‘Š°Š·Š° Š“Š°Š½Š½Ń‹Ń… устрŠ¾Š¹ŃŃ‚Š²Š° Š½ŠµŠøсŠæрŠ°Š²Š½Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3439,384 +4028,476 @@ msgid ""
 "                </ol>\n"
 "                "
 msgstr ""
+"\n"
+"                <p>Š‘Š°Š·Š° Š“Š°Š½Š½Ń‹Ń… ŠŗŠ½ŠøŠ³ устрŠ¾Š¹ŃŃ‚Š²Š° Š½ŠµŠøсŠæрŠ°Š²Š½Š°. ŠŸŠ¾ŠæрŠ¾Š±ŃƒŠ¹Ń‚Šµ "
+"сŠ»ŠµŠ“ующŠµŠµ:\n"
+"                <ol>\n"
+"                <li>ŠžŃ‚ŠŗŠ»ŃŽŃ‡ŠøтŠµ устрŠ¾Š¹ŃŃ‚Š²Š¾. Š”Š¾Š¶Š“ŠøтŠµŃŃŒ Š·Š°Š²ŠµŃ€ŃˆŠµŠ½Šøя  сŠ¾Š·Š“Š°Š½Šøя "
+"Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń… (т.Šµ. Š“Š¾Š¶Š“ŠøсŠµŃŒ ŠµŠµ Š³Š¾Ń‚Š¾Š²Š½Š¾ŃŃ‚Šø Šŗ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Š½Šøю). ŠŸŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠøтŠµ "
+"устрŠ¾Š¹ŃŃ‚Š²Š¾. Š¢ŠµŠæŠµŃ€ŃŒ Š“Š¾Š»Š¶Š½Š¾ Š²ŃŠµ Š·Š°Ń€Š°Š±Š¾Ń‚Š°Ń‚ŃŒ Š² ŠæрŠøŠ»Š¾Š¶ŠµŠ½ŠøŠø %(apps)s. Š•ŃŠ»Šø этŠ¾Š³Š¾ "
+"Š½Šµ ŠæрŠ¾ŠøŠ·Š¾ŃˆŠ»Š¾ ŠæŠµŃ€ŠµŃ…Š¾Š“ŠøтŠµ Šŗ сŠ»ŠµŠ“ующŠµŠ¼Ńƒ ŠæуŠ½Šŗту.</li>\n"
+"                <li>Š—Š°ŠŗрŠ¾Š¹Ń‚Šµ %(app)s ŠæрŠøŠ»Š¾Š¶ŠµŠ½ŠøŠµ. ŠŠ°Š¹Š“ŠøтŠµ фŠ°Š¹Š» media.xml Š² "
+"Š¾ŃŠ½Š¾Š²Š½Š¾Š¹ ŠæŠ°Š¼ŃŃ‚Šø устрŠ¾Š¹ŃŃ‚Š²Š°. Š£Š“Š°Š»ŠøтŠµ ŠµŠ³Š¾. ŠžŃ‚ŠŗŠ»ŃŽŃ‡ŠøтŠµ устрŠ¾Š¹ŃŃ‚Š²Š¾. ŠŸŠ¾Š“Š¾Š¶Š“ŠøтŠµ "
+"сŠ¾Š·Š“Š°Š½Šøя фŠ°Š¹Š»Š°. ŠŸŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠøтŠµ устрŠ¾Š¹ŃŃ‚Š²Š¾ сŠ½Š¾Š²Š° Šø Š·Š°ŠæустŠøтŠµ ŠæрŠøŠ»Š¾Š¶ŠµŠ½ŠøŠµ "
+"%(app)s.</li>\n"
+"                </ol>\n"
+"                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
+"<p>ŠšŠ½ŠøŠ³Šø с тŠ°ŠŗŠøŠ¼ Š½Š°Š·Š²Š°Š½ŠøŠµŠ¼ уŠ¶Šµ ŠµŃŃ‚ŃŒ Š² Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø. Š’сŠµŃ€Š°Š²Š½Š¾ Š“Š¾Š±Š°Š²Šøть?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
-msgstr ""
+msgstr "Š•ŃŃ‚ŃŒ ŠæŠ¾Š²Ń‚Š¾Ń€ŠµŠ½Šøя!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ° ŠŗŠ½ŠøŠ³ Š² устрŠ¾Š¹ŃŃ‚Š²Š¾."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø LRF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø HTML"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø LIT"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø MOBI"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
-msgstr ""
+msgstr "Š¢ŠµŠŗстŠ¾Š²Ń‹Šµ ŠŗŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
-msgstr ""
+msgstr "ŠšŠ½ŠøŠ³Šø PDF"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
-msgstr ""
+msgstr "ŠšŠ¾Š¼ŠøŠŗсы"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
+msgstr "ŠŃ€Ń…ŠøŠ²Ń‹"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š¼ŠµŃŃ‚Š° Š½Š° устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
+"<p>ŠŠµŠ¼Š¾Š³Ńƒ Š·Š°Š³Ń€ŃƒŠ·Šøть ŠŗŠ½ŠøŠ³Šø Š½Š° устрŠ¾Š¹ŃŃ‚Š²Š¾, ŠøŠ·-Š·Š° Š¾Ń‚ŃŃƒŃ‚ŃŃ‚Š²Šøя сŠ²Š¾Š±Š¾Š“Š½Š¾Š¹ ŠæŠ°Š¼ŃŃ‚Šø. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
-msgstr ""
+msgstr "Š£Š“Š°Š»ŃŃŽŃ‚ся ŠŗŠ½ŠøŠ³Šø ŠøŠ· устрŠ¾Š¹ŃŃ‚Š²Š°."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ рŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š’Ń‹Š±Ń€Š°Š½Š½Ń‹Ń… ŠŗŠ½ŠøŠ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr "ŠžŃ‚ŠæрŠ°Š²Š»ŃŃŽŃ‚ся Š½Š¾Š²Š¾ŃŃ‚Šø Š½Š° устрŠ¾Š¹ŃŃ‚Š²Š¾."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
-msgstr ""
+msgstr "ŠžŃ‚ŠæрŠ°Š²ŠŗŠ° ŠŗŠ½ŠøŠ³Šø Š² устрŠ¾Š¹ŃŃ‚Š²Š¾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
-msgstr ""
+msgstr "ŠŠµŃ‚ ŠæŠ¾Š“хŠ¾Š“ящŠµŠ³Š¾ фŠ¾Ń€Š¼Š°Ń‚Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
+"ŠŠµ Š¼Š¾Š³Ńƒ Š·Š°Š³Ń€ŃƒŠ·Šøть ŠŗŠ½ŠøŠ³Šø Š½Š° устрŠ¾Š¹ŃŃ‚Š²Š¾, тŠ°Šŗ ŠŗŠ°Šŗ Š¾Š½Šø Š½Šµ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‚ фŠ¾Ń€Š¼Š°Ń‚Ńƒ: "
+"<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ сŠ¾Ń…Ń€Š°Š½Šøть Š½Š° Š“ŠøсŠŗ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
-msgstr ""
+msgstr "Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ Š“ŠøрŠµŠŗтŠ¾Ń€Šøю ŠæŠ¾Š»ŃƒŃ‡Š°Ń‚ŠµŠ»Ń"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
+"<p>ŠŠµ Š¼Š¾Š³Ńƒ сŠ¾Ń…Ń€Š°Š½Šøть Š³Š½ŠøŠŗŠø Š½Š° Š“ŠøсŠŗ ŠæŠ¾Ń‚Š¾Š¼Ńƒ, чтŠ¾ фŠ¾Ń€Š¼Š°Ń‚ %s Š½Šµ Š“Š¾ŃŃ‚ŃƒŠæŠµŠ½ Š“Š»Ń:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ сŠ¾Ń…Ń€Š°Š½Šøть Š½ŠµŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ ŠŗŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
-msgstr ""
+msgstr "Š’Ń‹Š·Š²Š°Ń‚ŃŒ Š½Š¾Š²Š¾ŃŃ‚ŃŒ ŠøŠ· "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
-msgstr ""
+msgstr " Š·Š°Š³Ń€ŃƒŠ¶ŠµŠ½Š¾."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š²Ń‹Š±Ń€Š°Š½Š½Ń‹Ń… ŠŗŠ½ŠøŠ³"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€ŠµŃ‚ŃŒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
-msgstr ""
+msgstr "Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ Š“Š»Ń ŠæрŠ¾ŃŠ¼Š¾Ń‚Ń€Š° фŠ¾Ń€Š¼Š°Ń‚"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ Š¾Ń‚Šŗрыть ŠæŠ°ŠæŠŗу"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
-msgstr ""
+msgstr "%s Š½ŠµŠøŠ·Š²ŠµŃŃ‚Š½Ń‹Š¹ фŠ¾Ń€Š¼Š°Ń‚."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ Š½Š°ŃŃ‚Ń€Š¾Šøть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
-msgstr ""
+msgstr "ŠŸŠ¾ŠŗŠ° Š·Š°ŠæущŠµŠ½Š¾ Š·Š°Š“Š°Š½ŠøŠµ, Š½Šµ Š¼Š¾Š³Ńƒ Š½Š°ŃŃ‚Ń€Š¾Šøть"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
-msgstr ""
+msgstr "ŠšŠ¾ŠæŠøрŠ¾Š²Š°Š½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
-msgstr ""
+msgstr "ŠšŠ¾ŠæŠøрŠ¾Š²Š°Š½ŠøŠµ Š±ŠøŠ±Š»ŠøŠ¾Ń‚ŠµŠŗŠø Š² "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
-msgstr ""
+msgstr "ŠŠµŠ²ŠµŃ€Š½Š°Ń Š±Š°Š·Š° Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
+"<p>Š£Š¶Šµ ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся Š½ŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š°Ń Š±Š°Š·Š° Š“Š°Š½Š½Ń‹Ń… %s, уŠ“Š°Š»ŠøтŠµ ŠµŠµ ŠæрŠµŠ¶Š“Šµ, чŠµŠ¼ "
+"ŠæŠµŃ€ŠµŠ½ŠµŃŃ‚Šø ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŠ¼ŃƒŃŽ. <br>ŠžŃˆŠøŠ±ŠŗŠ°: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ ŠæŠµŃ€ŠµŠ½ŠµŃŃ‚Šø Š±Š°Š·Ńƒ Š“Š°Š½Š½Ń‹Ń…"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
-msgstr ""
+msgstr "ŠŠµŃ‚ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š¾Š¹ ŠæŠ¾Š“рŠ¾Š±Š½Š¾Š¹ ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†ŠøŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
-msgstr ""
+msgstr "ŠŠµ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š° ŠæŠ¾Š“рŠ¾Š±Š½Š°Ń ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøя ŠŗŠ½ŠøŠ³ Š½Š° устрŠ¾Š¹ŃŃ‚Š²Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° сŠ¾Š³Š»Š°ŃŠ¾Š²Š°Š½Šøя устрŠ¾Š¹ŃŃ‚Š²Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
+"Š‘Ń‹Š»Š° Š²Ń€ŠµŠ¼ŠµŠ½Š½Š°Ń Š¾Ń‰ŠøŠ±ŠŗŠ° Š¾Š±Ń‰ŠµŠ½Šøя с устрŠ¾Š¹ŃŃ‚Š²Š¾Š¼. ŠŸŠ¾Š¶Š°Š»ŃƒŃŃ‚Š°, ŠæŠµŃ€ŠµŠæŠ¾Š“ŠŗŠ»ŃŽŃ‡ŠøтŠµ "
+"устрŠ¾Š¹ŃŃ‚Š²Š¾ ŠøŠ»Šø ŠæŠµŃ€ŠµŠ³Ń€ŃƒŠ·ŠøтŠµ ŠµŠ³Š¾."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
+"<p>ŠŠµ Š¼Š¾Š³Ńƒ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ: %s<p>Š­Ń‚Š¾ <a href=\"%s\">DRM</a> ŠŗŠ½ŠøŠ³Š°. ŠŸŠµŃ€ŠµŠ“ "
+"ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½ŠøŠµ уŠ“Š°Š»ŠøтŠµ DRM ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŃ ŠæрŠ¾Š³Ń€Š°Š¼Š¼Š½Š¾Šµ Š¾Š±ŠµŃŠæŠµŃ‡ŠµŠ½ŠøŠµ."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
-msgstr ""
+msgstr "Š‘Š°Š·Š° Š“Š°Š½Š½Ń‹Ń… Š½Šµ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
+"ŠŠµ Š“Š¾ŃŃ‚ŃƒŠæŠ½Š° Š“ŠøрŠµŠŗтŠ¾Ń€Šøя, Š² ŠŗŠ¾Ń‚Š¾Ń€Š¾Š¹ Š“Š¾Š»Š¶Š½Š° Š±Ń‹Ń‚ŃŒ Š±Š°Š·Š° Š“Š°Š½Š½Ń‹Ń… %s. ŠŸŠ¾Š¶Š°Š»ŃƒŃŃ‚Š° "
+"Š²Ń‹Š±ŠµŃ€ŠµŃ‚Šµ Š½Š¾Š²Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
-msgstr ""
+msgstr "Š’Ń‹Š±ŠµŃ€ŠµŃ‚Šµ Š½Š¾Š²Š¾Šµ рŠ°ŃŠæŠ¾Š»Š¾Š¶ŠµŠ½ŠøŠµ Š±Š°Š·Ń‹ Š“Š°Š½Š½Ń‹Ń…."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
-msgstr ""
+msgstr "Š˜Š¼ŠµŠµŃ‚ся Š°ŠŗтŠøŠ²Š½Š¾Šµ Š·Š°Š“Š°Š½ŠøŠµ. Š’Ń‹ Š²ŃŠµŃ€Š°Š²Š½Š¾ хŠ¾Ń‚ŠøтŠµ Š²Ń‹Š¹Ń‚Šø?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
-msgstr ""
+msgstr "ŠŸŠ Š•Š”Š£ŠŸŠ Š•Š–Š”Š•ŠŠ˜Š•: ŠŠŗтŠøŠ²Š½Š¾Šµ Š·Š°Š“Š°Š½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
-msgstr ""
+msgstr "Š”Š¾ŃŃ‚ŃƒŠæŠ½Š¾ Š¾Š±Š½Š¾Š²Š»ŠµŠ½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
-msgid "Advanced search"
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
+msgid "Advanced search"
+msgstr "Š Š°ŃŃˆŠøрŠµŠ½Š½Ń‹Š¹ ŠæŠ¾ŠøсŠŗ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
-msgstr ""
+msgstr "&ŠŸŠ¾ŠøсŠŗ:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
-msgstr ""
+msgstr "Š”Š±Ń€Š¾Ń Š±Ń‹ŃŃ‚Ń€Š¾Š³Š¾ ŠæŠ¾ŠøсŠŗŠ°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
-msgstr ""
+msgstr "Š”рŠ°Š²Š½Šøть Š½ŠµŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
-msgstr ""
+msgstr "Š”рŠ°Š²Š½Šøть Š²ŃŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
-msgstr ""
+msgstr "Š”Š¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒ ŠæŠ¾ &ŠæŠ¾ŠæуŠ»ŃŃ€Š½Š¾ŃŃ‚Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть ŠŗŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
-msgstr ""
+msgstr "Š£Š“Š°Š»Šøть ŠŗŠ½ŠøŠ³Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
-msgstr ""
+msgstr "Š ŠµŠ“Š°ŠŗтŠøрŠ¾Š²Š°Ń‚ŃŒ Š¼ŠµŃ‚Š° ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
-msgstr ""
+msgstr "ŠžŃ‚ŠæрŠ°Š²Šøть Š² устрŠ¾Š¹ŃŃ‚Š²Š¾"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
-msgstr ""
+msgstr "Š”ŠŗŠ°Ń‡Š°Ń‚ŃŒ Š½Š¾Š²Š¾ŃŃ‚Šø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3825,41 +4506,41 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:58
 msgid "ERROR: Unhandled exception"
-msgstr ""
+msgstr "ŠžŠØŠ˜Š‘ŠšŠ: ŠŠµŠ¾Š±Ń€Š°Š±Š¾Ń‚Š°Š½Š½Š¾Šµ ŠøсŠŗŠ»ŃŽŃ‡ŠµŠ½ŠøŠµ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
-msgstr ""
+msgstr "Š Š°Š±Š¾Ń‚Š°:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Authors"
-msgstr ""
+msgstr "ŠŠ²Ń‚Š¾Ń€Ń‹"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Publishers"
-msgstr ""
+msgstr "ŠŸŃƒŠ±Š»ŠøŠŗŠ°Ń†Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:46
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
@@ -3898,7 +4579,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:375
 msgid "Fetch news from "
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ Š½Š¾Š²Š¾ŃŃ‚Šø ŠøŠ· "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
 msgid "You must set a username and password for %s"
@@ -3910,7 +4591,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
 msgid "&Font options"
-msgstr ""
+msgstr "&ŠžŠæцŠøŠø шрŠøфтŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
 msgid "Se&rif family:"
@@ -3926,11 +4607,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
 msgid "&Default font size:"
-msgstr ""
+msgstr "Š Š°Š·Š¼ŠµŃ€ шрŠøфтŠ° &ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:108
 msgid "Monospace &font size:"
-msgstr ""
+msgstr "Monospace &рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ°:"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
 msgid "S&tandard font:"
@@ -3950,7 +4631,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:114
 msgid "&User stylesheet"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŒŃŠŗŠøŠ¹ стŠøŠ»ŃŒ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
 msgid "Options to customize the ebook viewer"
@@ -3965,11 +4646,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:58
 msgid "Font options"
-msgstr ""
+msgstr "ŠŸŠ°Ń€Š°Š¼ŠµŃ‚ры шрŠøфтŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
 msgid "The serif font family"
-msgstr ""
+msgstr "ŠØрŠøфты сŠµŠ¼ŠµŠ¹ŃŃ‚Š²Š° serif"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
 msgid "The sans-serif font family"
@@ -3977,7 +4658,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
 msgid "The monospaced font family"
-msgstr ""
+msgstr "ŠØрŠøфты сŠµŠ¼ŠµŠ¹ŃŃ‚Š²Š° monospaced"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
 msgid "The standard font size in px"
@@ -3989,24 +4670,24 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:64
 msgid "The standard font type"
-msgstr ""
+msgstr "Š”тŠ°Š½Š“Š°Ń€Ń‚Š½Ń‹Š¹ шрŠøфт"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
-msgstr ""
+msgstr "Š”Š¾Š“ŠµŃ€Š¶Š°Š½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
 msgid "Go to..."
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠ¹Ń‚Šø..."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
 msgid "Position in book"
-msgstr ""
+msgstr "ŠŸŠ¾Š·ŠøцŠøя Š² ŠŗŠ½ŠøŠ³Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:208
 msgid "/Unknown"
-msgstr ""
+msgstr "/ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Š¾Šµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:213
 msgid "Go to a reference. To get reference numbers, use the reference mode."
@@ -4016,142 +4697,151 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
-msgstr ""
+msgstr "Š’Ń‹Š±Ń€Š°Ń‚ŃŒ эŠ»ŠµŠŗтрŠ¾Š½Š½ŃƒŃŽ ŠŗŠ½ŠøŠ³Ńƒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
-msgstr ""
+msgstr "Š­Š»ŠµŠŗтрŠ¾Š½Š½Š°Ń ŠŗŠ½ŠøŠ³Š°"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
-msgstr ""
+msgstr "Š”Š¾Š±Š°Š²Šøть Š·Š°ŠŗŠ»Š°Š“Šŗу"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
-msgstr ""
+msgstr "ŠŠµŃ‚ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŠøŠ¹ Š“Š»Ń: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·Šøть ŠæŠ¾Ń‚Š¾Šŗ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
-msgstr ""
+msgstr "Š Š°Š·Š¼ŠµŃ‚ŠŗŠ° %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ¶Š°ŠµŃ‚ся эŠ»ŠµŠŗтрŠ¾Š½Š½Š°Ń ŠŗŠ½ŠøŠ³Š°..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° DRM"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
-msgstr ""
+msgstr "ŠŠµ Š¼Š¾Š³Ńƒ Š¾Ń‚Šŗрыть эŠ»ŠµŠŗтрŠ¾Š½Š½ŃƒŃŽ ŠŗŠ½ŠøŠ³Ńƒ"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
-msgid "Previous page"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
-msgid "Font size larger"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
-msgid "Font size smaller"
-msgstr ""
+msgstr "Š”Š»ŠµŠ“ующŠ°Ń стрŠ°Š½ŠøцŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
-msgid "Find next"
-msgstr ""
+msgid "Previous page"
+msgstr "ŠŸŃ€ŠµŠ“ыŠ“ущŠ°Ń стрŠ°Š½ŠøцŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
-msgid "Copy to clipboard"
-msgstr ""
+msgid "Font size larger"
+msgstr "Š‘Š¾Š»ŃŒŃˆŠ¾Š¹ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ°"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+msgid "Font size smaller"
+msgstr "ŠœŠ°Š»ŠµŠ½ŃŒŠŗŠøŠ¹ рŠ°Š·Š¼ŠµŃ€ шрŠøфтŠ°"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
+msgid "Find next"
+msgstr "ŠŠ°Š¹Ń‚Šø сŠ»ŠµŠ“ующŠµŠµ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
+msgid "Copy to clipboard"
+msgstr "ŠšŠ¾ŠæŠøрŠ¾Š²Š°Ń‚ŃŒ Š² Š±ŃƒŃ„ŠµŃ€"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
-msgstr ""
+msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
-msgstr ""
+msgstr "Š”ŠæрŠ°Š²Š¾Ń‡Š½Ń‹Š¹ рŠµŠ¶ŠøŠ¼"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
+msgstr "Š—Š°ŠŗŠ»Š°Š“ŠŗŠ°"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
-msgstr ""
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
 msgid "Invalid regular expression: %s"
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Šµ Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠµ: %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4179,6 +4869,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4243,7 +4937,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:201
 msgid "Invalid fields. Available fields:"
-msgstr ""
+msgstr "ŠŠµŠæрŠ°Š²ŠøŠ»ŃŒŠ½Š¾Šµ ŠæŠ¾Š»Šµ. Š”Š¾ŃŃ‚ŃƒŠæŠ½Š¾Šµ ŠæŠ¾Š»Šµ:"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:208
 msgid "Invalid sort field. Available fields:"
@@ -4282,7 +4976,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:316
 msgid "You must specify at least one file to add"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ уŠŗŠ°Š·Š°Ń‚ŃŒ Š½Šµ Š¼ŠµŠ½ŠµŠµ Š¾Š“Š½Š¾Š³Š¾ фŠ°Š¹Š»Š° Š“Š»Ń Š“Š¾Š±Š°Š²Š»ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:334
 msgid ""
@@ -4295,7 +4989,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:346
 msgid "You must specify at least one book to remove"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ уŠŗŠ°Š·Š°Ń‚ŃŒ Š½Šµ Š¼ŠµŠ½ŠµŠµ Š¾Š“Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø Š“Š»Ń уŠ“Š°Š»ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:366
 msgid ""
@@ -4308,11 +5002,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:377
 msgid "You must specify an id and an ebook file"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ уŠŗŠ°Š·Š°Ń‚ŃŒ id Šø фŠ°Š¹Š» эŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:382
 msgid "ebook file must have an extension"
-msgstr ""
+msgstr "фŠ°Š¹Š» эŠ»ŠµŠŗтрŠ¾Š½Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø Š“Š¾Š»Š¶ŠµŠ½ ŠøŠ¼ŠµŃ‚ŃŒ рŠ°ŃŃˆŠøрŠµŠ½ŠøŠµ"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:390
 msgid ""
@@ -4326,7 +5020,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:403
 msgid "You must specify an id and a format"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ уŠŗŠ°Š·Š°Ń‚ŃŒ id Šø фŠ¾Ń€Š¼Š°Ń‚"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:421
 msgid ""
@@ -4340,11 +5034,11 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:429
 msgid "Print metadata in OPF form (XML)"
-msgstr ""
+msgstr "ŠŠ°ŠæŠµŃ‡Š°Ń‚Š°Ń‚ŃŒ Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š² OPF ŠøŠ· (XML)"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:434
 msgid "You must specify an id"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ Š½Š°Š·Š½Š°Ń‡Šøть id"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:448
 msgid ""
@@ -4361,7 +5055,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:461
 msgid "You must specify an id and a metadata file"
-msgstr ""
+msgstr "Š’Ń‹ Š“Š¾Š»Š¶Š½Ń‹ уŠŗŠ°Š·Š°Ń‚ŃŒ id Šø фŠ°Š¹Š» Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Ń…"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:473
 msgid ""
@@ -4376,15 +5070,15 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:481
 msgid "Export all books in database, ignoring the list of ids."
-msgstr ""
+msgstr "ŠŸŠµŃ€ŠµŠ“Š°Ń‚ŃŒ Š²ŃŠµ ŠŗŠ½ŠøŠ³Šø Š² Š±Š°Š·Ńƒ Š“Š°Š½Š½Ń‹Ń…, ŠøŠ³Š½Š¾Ń€Šøруя сŠæŠøсŠ¾Šŗ ids."
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:483
 msgid "Export books to the specified directory. Default is"
-msgstr ""
+msgstr "Š­ŠŗсŠæŠ¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒ ŠŗŠ½ŠøŠ³Šø Š²  уŠŗŠ°Š·Š°Š½Š½ŃƒŃŽ Š“ŠµŃ€ŠøŠŗтŠ¾Ń€Šøю. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:485
 msgid "Export all books into a single directory"
-msgstr ""
+msgstr "Š­ŠŗсŠæŠ¾Ń€Ń‚ŠøрŠ¾Š²Š°Ń‚ŃŒ Š²ŃŠµ ŠŗŠ½ŠøŠ³Šø Š² Š¾Š“Š½Ńƒ Š“ŠµŃ€Ń€ŠøŠŗтŠ¾Ń€Šøю"
 
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:487
 msgid "Create file names as author - title instead of title - author"
@@ -4406,79 +5100,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
-msgstr "Š”Š“ŠµŠ»Š°Š½Š¾ "
+msgstr "Š”Š¾Š·Š“Š°Š½Š¾ "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
-msgstr ""
+msgstr "ŠÆŠ·Ń‹Šŗ Š“Š»Ń Š¾Ń‚Š¾Š±Ń€Š°Š¶ŠµŠ½Šøя ŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŠµŠ»ŃŒŃŠŗŠ¾Š³Š¾ ŠøŠ½Ń‚ŠµŃ€Ń„ŠµŠ¹ŃŠ°"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Š¤Š¾Ń€Š¼Š°Ń‚ ŠŗŠ½ŠøŠ³Šø ŠæŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю ŠæŠ¾ŃŠ»Šµ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя."
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4496,17 +5198,17 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
 msgid "Failed to authenticate with server: %s"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° Š°Š²Ń‚Š¾Ń€ŠøŠ·Š°Ń†ŠøŠø Š½Š° сŠµŃ€Š²ŠµŃ€Šµ: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
-msgstr ""
+msgstr "ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Š°Ń Š·Š°Š³Š¾Ń‚Š¾Š²ŠŗŠ°"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
-msgstr ""
+msgstr "Š‘ŠµŠ·Ń‹Š¼ŃŠ½Š½Š°Ń стŠ°Ń‚ŃŒŃ"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
 msgid "Options to control the fetching of periodical content from the web."
@@ -4517,7 +5219,7 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -4525,37 +5227,37 @@ msgstr ""
 "ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾Šµ Š²Ń€ŠµŠ¼Ń Š¾Š¶ŠøŠ“Š°Š½Šøя Š¾Ń‚Š²ŠµŃ‚Š° Š¾Ń‚ сŠµŃ€Š²ŠµŃ€Š°. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default с"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
-"ŠœŠøŠ½ŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š» Š² сŠµŠŗуŠ½Š“Š°Ń… Š¼ŠµŠ¶Š“у ŠæŠ¾ŃŠ»ŠµŠ“Š¾Š²Š°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¼Šø сŠŗŠ°Ń‡ŠŗŠ°Š¼Šø. ŠŸŠ¾ "
+"ŠœŠøŠ½ŠøŠ¼Š°Š»ŃŒŠ½Ń‹Š¹ ŠøŠ½Ń‚ŠµŃ€Š²Š°Š» Š² сŠµŠŗуŠ½Š“Š°Ń… Š¼ŠµŠ¶Š“у ŠæŠ¾ŃŠ»ŠµŠ“Š¾Š²Š°Ń‚ŠµŠ»ŃŒŠ½Ń‹Š¼Šø Š²Ń‹Š·Š¾Š²Š°Š¼Šø. ŠŸŠ¾ "
 "уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default с"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 "ŠšŠ¾Š“ŠøрŠ¾Š²ŠŗŠ° Š²ŠµŠ±ŃŠ°Š¹Ń‚Š¾Š², ŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ Š²Ń‹ сŠ¾Š±ŠøрŠ°ŠµŃ‚ŠµŃŃŒ сŠŗŠ°Ń‡ŠøŠ²Š°Ń‚ŃŒ. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю Š“ŠµŠ»Š°ŠµŃ‚ся "
-"ŠæŠ¾ŠæытŠŗŠ° уŠ³Š°Š“Š°Ń‚ŃŒ ŠŗŠ¾Š“ŠøрŠ¾Š²Šŗу."
+"ŠæŠ¾ŠæытŠŗŠ° Š¾ŠæрŠµŠ“ŠµŠ»ŠµŠ½Šøя ŠŗŠ¾Š“ŠøрŠ¾Š²ŠŗŠø."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
 "one regexp, it will be followed. By default all links are followed."
 msgstr ""
-"Š¢Š¾Š»ŃŒŠŗŠ¾ ссыŠ»ŠŗŠø, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‚ этŠ¾Š¼Ńƒ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю, Š±ŃƒŠ“ут "
-"сŠŗŠ°Ń‡Š°Š½Ń‹. Š­Ń‚Ńƒ Š¾ŠæцŠøю Š¼Š¾Š¶Š½Š¾ уŠŗŠ°Š·Š°Ń‚ŃŒ Š½ŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ рŠ°Š·, Š² этŠ¾Š¼ сŠ»ŃƒŃ‡Š°Šµ ссыŠ»ŠŗŠ° Š±ŃƒŠ“ŠµŃ‚ "
-"сŠŗŠ°Ń‡Š°Š½Š° тŠ¾Š³Š“Š°, ŠŗŠ¾Š³Š“Š° Š¾Š½Š° сŠ¾Š²ŠæŠ°Š“ŠµŃ‚ хŠ¾Ń‚я Š±Ń‹ с Š¾Š“Š½ŠøŠ¼ ŠøŠ· рŠµŠ³ŃƒŠ»ŃŃ€Š½Ń‹Ń… Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠ¹. "
-"ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, Š½ŠøŠŗŠ°ŠŗŠøŠµ ссыŠ»ŠŗŠø сŠŗŠ°Ń‡ŠøŠ²Š°ŃŽŃ‚ся."
+"Š‘ŃƒŠ“ут сŠŗŠ°Ń‡Š°Š½Ń‹, тŠ¾Š»ŃŒŠŗŠ¾ ссыŠ»ŠŗŠø, сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‰ŠøŠµ этŠ¾Š¼Ńƒ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю. "
+"Š­Ń‚Ńƒ Š¾ŠæцŠøю Š¼Š¾Š¶Š½Š¾ уŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š½ŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ рŠ°Š·, Š² этŠ¾Š¼ сŠ»ŃƒŃ‡Š°Šµ ссыŠ»ŠŗŠ° Š±ŃƒŠ“ŠµŃ‚ "
+"сŠŗŠ°Ń‡ŠøŠ²Š°Ń‚ŃŒŃŃ тŠ¾Š³Š“Š°, ŠŗŠ¾Š³Š“Š° Š¾Š½Š° сŠ¾Š²ŠæŠ°Š“ŠµŃ‚ хŠ¾Ń‚я Š±Ń‹ с Š¾Š“Š½ŠøŠ¼ ŠøŠ· рŠµŠ³ŃƒŠ»ŃŃ€Š½Ń‹Ń… "
+"Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠ¹. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, Š½ŠøŠŗŠ°ŠŗŠøŠµ ссыŠ»ŠŗŠø Š½Šµ сŠŗŠ°Ń‡ŠøŠ²Š°ŃŽŃ‚ся."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4564,13 +5266,13 @@ msgid ""
 "applied first."
 msgstr ""
 "Š’сŠµ ссыŠ»ŠŗŠø, ŠŗŠ¾Ń‚Š¾Ń€Ń‹Šµ сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²ŃƒŃŽŃ‚ этŠ¾Š¼Ńƒ рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š¼Ńƒ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøю, Š±ŃƒŠ“ут "
-"ŠæрŠ¾ŠæущŠµŠ½Ń‹. Š­Ń‚Ńƒ Š¾ŠæцŠøю Š¼Š¾Š¶Š½Š¾ уŠŗŠ°Š·Š°Ń‚ŃŒ Š½ŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ рŠ°Š·, Š² этŠ¾Š¼ сŠ»ŃƒŃ‡Š°Šµ ссыŠ»ŠŗŠ° Š±ŃƒŠ“ŠµŃ‚ "
-"ŠæрŠ¾Ń‰ŠµŠ½Š° тŠ¾Š³Š“Š°, ŠŗŠ¾Š³Š“Š° Š¾Š½Š° сŠ¾Š²ŠæŠ°Š“ŠµŃ‚ хŠ¾Ń‚я Š±Ń‹ с Š¾Š“Š½ŠøŠ¼ ŠøŠ· рŠµŠ³ŃƒŠ»ŃŃ€Š½Ń‹Ń… Š²Ń‹Ń€Š°Š¶ŠµŠ½ŠøŠ¹. "
-"ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю, Š½ŠøŠŗŠ°ŠŗŠøŠµ ссыŠ»ŠŗŠø Š½Šµ ŠæрŠ¾ŠæусŠŗŠ°ŃŽŃ‚ся. Š•ŃŠ»Šø уŠŗŠ°Š·Š°Š½Ń‹ Š¾Š±Šµ Š¾ŠæцŠøŠø --"
-"filter-regexp Šø --match-regexp, тŠ¾ Š²Š½Š°Ń‡Š°Š»Šµ Š±ŃƒŠ“ŠµŃ‚ учŠøтыŠ²Š°Ń‚ŃŒŃŃ --filter-regexp."
+"Š¾Ń‚ŠŗŠ»Š¾Š½ŠµŠ½Ń‹. Š­Ń‚Ńƒ Š¾ŠæцŠøю Š¼Š¾Š¶Š½Š¾ уŠŗŠ°Š·Š°Ń‚ŃŒ Š½ŠµŃŠŗŠ¾Š»ŃŒŠŗŠ¾ рŠ°Š·, Š² этŠ¾Š¼ сŠ»ŃƒŃ‡Š°Šµ ŠæрŠø усŠ»Š¾Š²ŠøŠø "
+"сŠ¾Š²ŠæŠ°Š“ŠµŠ½Šøя рŠµŠ³ŃƒŠ»ŃŃ€Š½Š¾Š³Š¾ Š²Ń‹Ń€Š°Š¶ŠµŠ½Šøя с ссыŠ»ŠŗŠ¾Š¹ Š¾Š½Š° Š±ŃƒŠ“ŠµŃ‚ Š¾Ń‚ŠŗŠ»Š¾Š½ŠµŠ½Š°. ŠŸŠ¾ "
+"уŠ¼Š¾Š»Ń‡Š°Š½Šøю, ссыŠ»ŠŗŠø Š½Šµ Š¾Ń‚ŠŗŠ»Š¾Š½ŃŃŽŃ‚ся. Š•ŃŠ»Šø уŠŗŠ°Š·Š°Š½Ń‹ Š¾Š±Šµ Š¾ŠæцŠøŠø --filter-regexp Šø --"
+"match-regexp, тŠ¾ Š²Š½Š°Ń‡Š°Š»Šµ Š±ŃƒŠ“ŠµŃ‚ учŠøтыŠ²Š°Ń‚ŃŒŃŃ --filter-regexp."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "ŠŠµ сŠŗŠ°Ń‡ŠøŠ²Š°Ń‚ŃŒ фŠ°Š¹Š»Ń‹ стŠøŠ»ŠµŠ¹ CSS."
 
@@ -4622,12 +5324,12 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
 msgid "Don't show the progress bar"
-msgstr ""
+msgstr "ŠŠµ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ ŠøŠ½Š“ŠøŠŗŠ°Ń‚Š¾Ń€ Š²Ń‹ŠæŠ¾Š»Š½ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
 msgid "Very verbose output, useful for debugging."
-msgstr ""
+msgstr "ŠžŃ‡ŠµŠ½ŃŒ ŠæŠ¾Š“рŠ¾Š±Š½Ń‹Š¹ Š²Ń‹Š²Š¾Š“, ŠøсŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:57
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:107
@@ -4656,122 +5358,149 @@ msgid ""
 "Available builtin recipes are:\n"
 "%s\n"
 msgstr ""
+"%%prog [options] ARG\n"
+"\n"
+"%%prog Š°Š½Š°Š»ŠøŠ·ŠøруŠµŃ‚ Š¾Š½Š»Š°Š¹Š½ рŠµŃŃƒŃ€ŃŃ‹ стŠ°Ń‚ŠµŠ¹, тŠ°ŠŗŠøŠµ ŠŗŠ°Šŗ RSS ŠøŠ»Šø ATOM стрŠ°Š½Šøцы Šø "
+"\n"
+"Š¾Ń€Š³Š°Š½ŠøŠ·ŃƒŠµŃ‚ сŠ¾Š“ŠµŃ€Š¶ŠøŠ¼Š¾Šµ стŠ°Ń‚ŠµŠ¹ Š² хŠ¾Ń€Š¾ŃˆŃƒŃŽ ŠøŠµŃ€Š°Ń€Ń…Šøю.\n"
+"\n"
+"ARG Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ Š¾Š“ŠøŠ½ ŠøŠ·:\n"
+"\n"
+"file name            - %%prog Š±ŃƒŠ“ŠµŃ‚ ŠæытŠ°Ń‚ŃŒŃŃ Š·Š°Š³Ń€ŃƒŠ·Šøть Š½Š°Š±Š¾Ń€ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š² ŠøŠ· "
+"фŠ°Š¹Š»Š°\n"
+"\n"
+"builtin recipe title - %%prog Š±ŃƒŠ“ŠµŃ‚ Š·Š°Š³Ń€ŃƒŠ¶Š°Ń‚ŃŒ Š²ŃŃ‚Ń€Š¾ŠµŠ½Š½Ń‹Š¹ Š½Š°Š±Š¾Ń€ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š² Šø  "
+"ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠæрŠø Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø Š¼Š°Ń‚ŠµŃ€ŠøŠ°Š»Š°. Š”Š»Ń Š² т.ч. Newsweek or \"The BBC\" ŠøŠ»Šø "
+"\"The New York Times\"\n"
+"\n"
+"recipe as a string   - %%prog Š±ŃƒŠ“ŠµŃ‚ Š·Š°Š³Ń€ŃƒŠ¶Š°Ń‚ŃŒ Š½Š°Š±Š¾Ń€ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š² "
+"Š½ŠµŠæŠ¾ŃŃ€ŠµŠ“стŠ²ŠµŠ½Š½Š¾ ŠøŠ· стрŠ¾ŠŗŠø Š°Ń€Š³ŃƒŠ¼ŠµŠ½Ń‚Š¾Š².\n"
+"\n"
+"Š”Š¾ŃŃ‚ŃƒŠæŠ½Ń‹Šµ Š²ŃŃ‚Ń€Š¾ŠµŠ½Š½Ń‹Šµ Š½Š°Š±Š¾Ń€Ń‹ ŠæŠ°Ń€Š°Š¼ŠµŃ‚Ń€Š¾Š²:\n"
+"%s\n"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:85
 msgid ""
 "Options to control web2disk (used to fetch websites linked from feeds)"
 msgstr ""
+"ŠžŠæцŠøŠø ŠŗŠ¾Š½Ń‚Ń€Š¾Š»Ń web2disk (Š¾Š±Ń‹Ń‡Š½Š¾ Š²Ń‹Š·Ń‹Š²Š°ŃŽŃ‚ся Š»ŠøŠ½ŠŗŠø сŠ°Š¹Ń‚Š¾Š² ŠæŠµŃ€ŠµŠ²Š¾Š“Š½Ń‹Ń… стрŠ°Š½Šøц )"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
 msgid "Dont show the progress bar"
-msgstr ""
+msgstr "ŠŠµ ŠæŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ ŠøŠ½Š“ŠøŠŗŠ°Ń‚Š¾Ń€ Š²Ń‹ŠæŠ¾Š»Š½ŠµŠ½Šøя"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
-msgstr ""
+msgstr "Š’Ń‹Š·Ń‹Š²Š°ŃŽŃ‚ся Š·Š°Š³Š¾Ń‚Š¾Š²ŠŗŠø..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
-msgstr ""
+msgstr "ŠŠµŠøŠ·Š²ŠµŃŃ‚Š½Ń‹Š¹ Š½Š¾Š²Š¾ŃŃ‚Š½Š¾Š¹ рŠµŃŃƒŃ€Ń"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
-msgstr ""
+msgstr "Š—Š°Š³Ń€ŃƒŠ·ŠŗŠ° Š·Š°ŠŗŠ¾Š½Ń‡ŠµŠ½Š°"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
-msgstr ""
+msgstr "ŠŠµŃƒŠ“Š°Ń‡Š½Š°Ń Š·Š°Š³Ń€ŃƒŠ·ŠŗŠ° сŠ»ŠµŠ“ующŠøх стŠ°Ń‚ŠµŠ¹:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
-msgstr ""
+msgstr " ŠøŠ· "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
-msgstr ""
+msgstr "ŠŠµŃƒŠ“Š°Ń‡Š½Š°Ń Š·Š°Š³Ń€ŃƒŠ·ŠŗŠ° чŠ°ŃŃ‚ŠµŠ¹ сŠ»ŠµŠ“ующŠøх стŠ°Ń‚ŠµŠ¹:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
-msgstr ""
+msgstr "\tŠ‘ŠøтыŠµ ссыŠ»ŠŗŠø:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
-msgstr ""
+msgstr "Š”тŠ°Ń‚ŃŒŃ Š½Šµ Š²Ń‹Š·Ń‹Š²Š°ŠµŃ‚ся. Š—Š°ŠæустŠøтŠµ с --debug Šø ŠæŠ¾ŃŠ¼Š¾Ń‚Ń€ŠøтŠµ ŠæрŠøчŠøŠ½Ńƒ."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
-msgstr ""
+msgstr "ŠŸŠ¾Š»ŃƒŃ‡Šøть Š·Š°Š³Š¾Ń‚Š¾Š²ŠŗŠø Š“Š»Ń Š¾Š³Š»Š°Š²Š»ŠµŠ½Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
-msgstr ""
+msgstr "ŠŸŠ¾ŠæытŠŗŠ° сŠŗŠ°Ń‡Š°Ń‚ŃŒ Š¾Š±Š»Š¾Š¶Šŗу..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
-msgstr ""
+msgstr "ŠŠ°Ń‡Š°Š»Š¾ Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø [%d ŠæŠ¾Ń‚Š¾Šŗ(Šø)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
-msgstr ""
+msgstr "Š—Š°Š³Š¾Ń‚Š¾Š²ŠŗŠø Š·Š°ŠŗŠ°Ń‡ŠøŠ²Š°Ń‚ся Š² %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
-msgstr ""
+msgstr "ŠŠµŠ²Š¾Š·Š¼Š¾Š¶Š½Š¾ сŠŗŠ°Ń‡Š°Ń‚ŃŒ Š¾Š±Š»Š¾Š¶Šŗу: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
-msgstr ""
+msgstr "Š”ŠŗŠ°Ń‡ŠøŠ²Š°ŠµŃ‚ся Š¾Š±Š»Š¾Š¶ŠŗŠ° ŠøŠ· %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
-msgstr ""
+msgstr "Š”тŠ°Ń‚ŃŒŃ Š±ŠµŠ· Š½Š°Š·Š²Š°Š½Šøя"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
+"\n"
+"Š”ŠŗŠ°Ń‡ŠµŠ½Š° стŠ°Ń‚ŃŒŃ %s ŠøŠ· %s\n"
+"%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
-msgstr ""
+msgstr "Š”тŠ°Ń‚ŃŒŃ сŠŗŠ°Ń‡ŠµŠ½Š°: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø стŠ°Ń‚ŃŒŠø: %s ŠøŠ· %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
-msgstr ""
+msgstr "ŠžŃˆŠøŠ±ŠŗŠ° Š·Š°Š³Ń€ŃƒŠ·ŠŗŠø стŠ°Ń‚ŃŒŠø: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
-msgstr ""
+msgstr "Š”Š¾ŃŃ‚Š°Š°Š²Š»ŃŠµŃ‚ся Š¼Š°Ń‚ŠµŃ€ŠøŠ°Š»"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
+"%prog URL\n"
+"\n"
+"Š“Š“Šµ URL Š½Š° ŠæрŠøŠ¼ŠµŃ€ http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
-"ŠšŠ°Ń‚Š°Š»Š¾Š³, Š² ŠŗŠ¾Ń‚Š¾Ń€Ń‹Š¹ Š±ŃƒŠ“ŠµŃ‚ сŠ¾Ń…Ń€Š°Š½ŠµŠ½ фŠ°Š¹Š» ŠæŠ¾ URL. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
+"ŠžŃŠ½Š¾Š²Š½Š°Ń Š“ŠøрŠµŠŗтŠ¾Ń€Šøя, Š² ŠŗŠ¾Ń‚Š¾Ń€ŃƒŃŽ сŠ¾Ń…Ń€Š°Š½ŃŃ‚ся URL. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
-"ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾ чŠøсŠ»Š¾ урŠ¾Š²Š½ŠµŠ¹ рŠµŠŗурсŠøŠø, т.Šµ. Š³Š»ŃƒŠ±ŠøŠ½Š° Š²Š»Š¾Š¶ŠµŠ½Š½Š¾ŃŃ‚Šø ссыŠ»Š¾Šŗ. ŠŸŠ¾ "
+"ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾ чŠøсŠ»Š¾ урŠ¾Š²Š½ŠµŠ¹ Š²Š»Š¾Š¶ŠµŠ½Šøя, т.Šµ. Š³Š»ŃƒŠ±ŠøŠ½Š° ŠæŠ¾ŃŠ»ŠµŠ“Š¾Š²Š°Ń‚ŠµŠ»ŃŒŠ½Ń‹Ń… ссыŠ»Š¾Šŗ. ŠŸŠ¾ "
 "уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -4779,9 +5508,40 @@ msgstr ""
 "ŠœŠ°ŠŗсŠøŠ¼Š°Š»ŃŒŠ½Š¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ фŠ°Š¹Š»Š¾Š² Š“Š»Ń сŠŗŠ°Ń‡ŠøŠ²Š°Š½Šøя. ŠŸŃ€ŠøŠ¼ŠµŠ½ŠøŠ¼Š¾ тŠ¾Š»ŃŒŠŗŠ¾ Šŗ фŠ°Š¹Š»Š°Š¼ ŠøŠ· "
 "тŠµŠ³Š¾Š² <a href>. ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
-msgstr "ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š“ŠµŃ‚Š°Š»ŃŒŠ½ŃƒŃŽ ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю. ŠŸŠ¾Š»ŠµŠ·Š½Š¾ ŠæрŠø Š¾Ń‚Š»Š°Š“ŠŗŠµ"
+msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ Š“ŠµŃ‚Š°Š»ŃŒŠ½ŃƒŃŽ ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю. Š˜ŃŠæŠ¾Š»ŃŒŠ·ŃƒŠµŃ‚ся Š“Š»Ń Š¾Ń‚Š»Š°Š“ŠŗŠø."
+
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&ŠžŃ‡ŠµŃ€ŠµŠ“Š½Š¾ŃŃ‚ŃŒ рŠ°Š±Š¾Ń‚ ŠæрŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Š½Šøя:"
+
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "Š”Š¾Š±Š°Š²Šøть ŠŗŠ½ŠøŠ³Šø рŠµŠŗурсŠøŠ²Š½Š¾ (ŠšŠ°Š¶Š“ыŠ¹ фŠ°Š¹Š» Š¾Š“Š½Š¾Š¹ ŠŗŠ½ŠøŠ³Šø Š² Š“ŠøрŠµŠŗтŠ¾Ń€ŠøŠø ŠæрŠøŠ½ŠøŠ¼Š°ŠµŃ‚ся, "
+#~ "ŠŗŠ°Šŗ ŠŗŠ½ŠøŠ³Š° Š“руŠ³Š¾Š³Š¾ фŠ¾Ń€Š¼Š°Ń‚Š°)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "Š”Š¾Š±Š°Š²Šøть ŠŗŠ½ŠøŠ³Šø рŠµŠŗурсŠøŠ²Š½Š¾ (ŠœŠ½Š¾Š¶ŠµŃŃ‚Š²Š¾ ŠŗŠ½ŠøŠ³ Š² Š“ŠµŃ€ŠøŠŗтŠ¾Ń€ŠøŠø ŠæрŠøŠ½ŠøŠ¼Š°ŃŽŃ‚ся, ŠŗŠ°Šŗ "
+#~ "ŠŗŠ½ŠøŠ³Šø рŠ°Š·Š½Ń‹Ń… фŠ¾Ń€Š¼Š°Ń‚Š¾Š²)"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Š ŠøŠ“ŠµŃ€\n"
+#~ "%s Š“Š¾ŃŃ‚ŃƒŠæŠµŠ½"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "ŠšŠ°Ń€Ń‚Š°\n"
+#~ "%s Š“Š¾ŃŃ‚ŃƒŠæŠ½Š°"
 
 #~ msgid ""
 #~ "Detect a chapter beginning at an element having the specified attribute. The "
@@ -4794,3 +5554,40 @@ msgstr "ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š“ŠµŃ‚Š°Š»ŃŒŠ½ŃƒŃŽ ŠøŠ½Ń„Š¾Ń€Š¼Š°Ń†Šøю. ŠŸŠ¾Š»ŠµŠ·
 #~ "Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Š°,рŠµŠ³. Š²Ń‹Ń€Š°Š¶. Š·Š½Š°Ń‡ŠµŠ½Šøя Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Š°. ŠŠ°ŠæрŠøŠ¼ŠµŃ€, Š“Š»Ń сŠ¾Š¾Ń‚Š²ŠµŃ‚стŠ²Šøя Š²ŃŠµŠ¼ "
 #~ "тŠµŠ³Š°Š¼Šø Š·Š°Š³Š¾Š»Š¾Š²ŠŗŠ¾Š² с Š°Ń‚Ń€ŠøŠ±ŃƒŃ‚Š¾Š¼ class=\"chapter\" Š½ŠµŠ¾Š±Ń…Š¾Š“ŠøŠ¼ ŠøсŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ \"h\\"
 #~ "d,class,chapter\". ŠŸŠ¾ уŠ¼Š¾Š»Ń‡Š°Š½Šøю: %default"
+
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "Š”ŠæрŠ¾ŃŠøть &ŠæŠ¾Š“тŠ²ŠµŃ€Š¶Š“ŠµŠ½Šøя ŠæŠµŃ€ŠµŠ“ уŠ“Š°Š»ŠµŠ½ŠøŠµŠ¼ фŠ°Š¹Š»Š°"
+
+#~ msgid "Confirm delete"
+#~ msgstr "ŠŸŠ¾Š“тŠ²ŠµŃ€Š“Šøть уŠ“Š°Š»ŠµŠ½ŠøŠµ"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Š’Ń‹ уŠ²ŠµŃ€ŠµŠ½Ń‹, чтŠ¾ хŠ¾Ń‚ŠøтŠµ уŠ“Š°Š»Šøть этŠø ŠŗŠ½ŠøŠ³Šø %d?"
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "ŠŸŃ€ŠµŠ¾Š±Ń€Š°Š·Š¾Š²Š°Ń‚ŃŒ Š±Š¾Š»ŃŒŃˆŠ¾Šµ ŠŗŠ¾Š»ŠøчŠµŃŃ‚Š²Š¾ фŠ¾Ń€Š¼Š°Ń‚Š¾Š² ŠŗŠ½ŠøŠ³ Š² фŠ°Š¹Š» epub ŠŸŠ¾Š“Š“ŠµŃ€Š¶ŠøŠ²Š°ŠµŠ¼Ń‹Šµ "
+#~ "фŠ¾Ń€Š¼Š°Ń‚Ń‹: %s\n"
+
+#~ msgid "LRF"
+#~ msgstr "LRF"
+
+#~ msgid "EPUB"
+#~ msgstr "EPUB"
+
+#~ msgid "&Output format:"
+#~ msgstr "&Š¤Š¾Ń€Š¼Š°Ń‚ рŠµŠ·ŃƒŠ»ŃŒŃ‚Š°Ń‚Š°"
+
+#~ msgid ""
+#~ "If you disable this setting, metadatas is guessed from the filename instead. "
+#~ "This can be configured in the Advanced section."
+#~ msgstr ""
+#~ "Š•ŃŠ»Šø Š²Ń‹ Š·Š°Š±Š»Š¾ŠŗŠøрŠ¾Š²Š°Š»Šø эту стрŠ¾Šŗу, Š¼ŠµŃ‚Š°Š“Š°Š½Š½Ń‹Šµ Š¾ŠæрŠµŠ“ŠµŠ»ŃŃ‚ся ŠøŠ· Š½Š°Š·Š²Š°Š½Šøя фŠ°Š¹Š»Š°. "
+#~ "Š­Ń‚Š¾ Š¼Š¾Š¶ŠµŃ‚ Š±Ń‹Ń‚ŃŒ Š½Š°ŃŃ‚Ń€Š¾ŠµŠ½Š¾ Š² Š Š°ŃŃˆŠøрŠµŠ½Š½Š¾Š¹ сŠµŠŗцŠøŠø."
+
+#~ msgid "Enable system &tray icon"
+#~ msgstr "Š˜ŃŠæŠ¾Š»ŃŒŠ·Š¾Š²Š°Ń‚ŃŒ ŠøŠŗŠ¾Š½Šŗу Š² ŠæŠ°Š½ŠµŠ»Šø Š·Š°Š“Š°Ń‡"
diff --git a/src/calibre/translations/sk.po b/src/calibre/translations/sk.po
new file mode 100644
index 0000000000..6f9f006e35
--- /dev/null
+++ b/src/calibre/translations/sk.po
@@ -0,0 +1,5429 @@
+# Slovak translation for calibre
+# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# This file is distributed under the same license as the calibre package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: calibre\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-15 22:58+0000\n"
+"Last-Translator: Michael Gallo <michael.gallo@tiscali.it>\n"
+"Language-Team: Slovak <sk@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "NeznƔme"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
+msgid "Unable to detect the %s disk drive. Try rebooting."
+msgstr "Nepodarilo sa nĆ”jsÅ„ disk %s. SkĆŗste reÅ”tartovaÅ„ systĆ©m."
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
+msgid "The reader has no storage card connected."
+msgstr "V čƭtacom zariadenĆ­ nie je vloženĆ” žiadna pamĆ¤Å„ovĆ” karta."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
+msgid "Options to control the conversion to EPUB"
+msgstr "Možnosti prevodu do formĆ”tu EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+msgid ""
+"The output EPUB file. If not specified, it is derived from the input file "
+"name."
+msgstr ""
+"VĆ½stupnĆ½ EPUB sĆŗbor. Ak nie je určenĆ½, bude odvodenĆ½ od nĆ”zvu vstupnĆ©ho "
+"sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+msgid ""
+"Profile of the target device this EPUB is meant for. Set to None to create a "
+"device independent EPUB. The profile is used for device specific "
+"restrictions on the EPUB. Choices are: "
+msgstr ""
+"Profil cieľovĆ©ho zariadenia pre ktorĆ© je tento EPUB sĆŗbor určenĆ½. Zvoľte "
+"\"Žiadne\" ak si želĆ”te vytvoriÅ„ od zariadenia nezĆ”vislĆ½ sĆŗbor. Profil "
+"zariadenia Å”pecifikuje jeho obmedzenia v rĆ”mci EPUB Å”tandardu. Možnosti sĆŗ: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+msgid ""
+"Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
+"existing CSS declarations in the source files."
+msgstr ""
+"Buď cesta k CSS sĆŗboru, alebo priamo zdrojovĆ½ text CSS. Toto CSS nahradĆ­ "
+"akĆ©koľvek definĆ­cie CSS prĆ­tomnĆ© v zdrojovĆ½ch sĆŗboroch."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
+msgid "Control auto-detection of document structure."
+msgstr "Autodetekcia Å”truktĆŗry dokumentu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
+msgid ""
+"An XPath expression to detect chapter titles. The default is to consider "
+"<h1> or\n"
+"<h2> tags that contain the words \"chapter\",\"book\",\"section\" or "
+"\"part\" as chapter titles as \n"
+"well as any tags that have class=\"chapter\". \n"
+"The expression used must evaluate to a list of elements. To disable chapter "
+"detection,\n"
+"use the expression \"/\". See the XPath Tutorial in the calibre User Manual "
+"for further\n"
+"help on using this feature.\n"
+msgstr ""
+"VĆ½raz XPath na automatickĆ© rozoznĆ”vanie nĆ”zvov kapitol. Å tandardne sa za "
+"začiatky kapitol považujĆŗ bloky <h1> alebo <h2> obsahujĆŗce slovĆ” "
+"\"chapter\", \"book\", \"section\" alebo \"part\" a takisto akĆ©koľvek bloky "
+"s atribĆŗtom class=\"chapter\". VyhodnotenĆ­m vĆ½razu musĆ­ vzniknĆŗÅ„ zoznam "
+"prvkov. Ak si neželĆ”te automatickĆŗ detekciu nĆ”zvov kapitol vykonĆ”vaÅ„, "
+"zadajte vĆ½raz \"/\". Viac informĆ”cii nĆ”jdete v XPath nĆ”vode, v "
+"pouÅ¾Ć­vateľskej prĆ­ručke programu Calibre.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+msgid ""
+"Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
+"page breaks before chapters. A value of \"rule\" will insert a line before "
+"chapters. A value of \"none\" will disable chapter marking and a value of "
+"\"both\" will use both page breaks and lines to mark chapters."
+msgstr ""
+"SpĆ“sob, akĆ½m majĆŗ byÅ„ oddelenĆ© nĆ”jdenĆ© kapitoly. MožnosÅ„ \"zalomenie "
+"strany\" vloÅ¾Ć­ pred začiatky kapitol zalomenia strĆ”n. MožnosÅ„ \"čiara\" "
+"vloÅ¾Ć­ pred začiatky kapitol vodorovnĆŗ čiaru. MožnosÅ„ \"žiadne\" spĆ“sobĆ­, že "
+"kapitoly nebudĆŗ nijako oddelenĆ©. MožnosÅ„ \"oboje\" vloÅ¾Ć­ pred začiatky "
+"kapitol zalomenia strĆ”n, spolu s vodorovnĆ½mi čiarami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+msgid "Path to the cover to be used for this book"
+msgstr ""
+"Cesta k obrazovĆ©mu sĆŗboru, ktorĆ½ sa mĆ” použiÅ„ ako obĆ”lka tejto knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
+msgid ""
+"Use the cover detected from the source file in preference to the specified "
+"cover."
+msgstr "ObĆ”lka nĆ”jdenĆ” v zdrojovom sĆŗbore mĆ” prednosÅ„ pred zvolenou obĆ”lkou."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+msgid ""
+"Control the automatic generation of a Table of Contents. If an OPF file is "
+"detected\n"
+"and it specifies a Table of Contents, then that will be used rather than "
+"trying\n"
+"to auto-generate a Table of Contents.\n"
+msgstr ""
+"OvlĆ”danie automatickej tvorby obsahu. Ak je sĆŗbor identifikovanĆ½ ako OPF\n"
+"a jeho sĆŗčasÅ„ou je obsah, tak tento bude použitĆ½, namiesto\n"
+"automaticky generovanƩho obsahu.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
+msgid ""
+"Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
+"is: %default. Links are only added to the TOC if less than the --toc-"
+"threshold number of chapters were detected."
+msgstr ""
+"MaximĆ”lny počet odkazov v obsahu. 0 znamenĆ” neobmedzenĆ½ počet. Å tandardnĆ” "
+"hodnota je %default. Do obsahu budĆŗ pridanĆ© odkazy len ak počet automaticky "
+"nĆ”jdenĆ½ch kapitol neprekročƭ --toc-threshold."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
+msgid "Don't add auto-detected chapters to the Table of Contents."
+msgstr "NepridĆ”vaÅ„ automaticky nĆ”jdenĆ© kapitoly do obsahu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
+msgid ""
+"If fewer than this number of chapters is detected, then links are added to "
+"the Table of Contents. Default: %default"
+msgstr ""
+"Ak počet automaticky nĆ”jdenĆ½ch kapitol neprekročƭ tĆŗto hodnotu, budĆŗ odkazy "
+"na ne pridanĆ© do obsahu. Å tandardnĆ” hodnota je %default."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level one. If this is specified, it takes precedence over "
+"other forms of auto-detection."
+msgstr ""
+"VĆ½raz XPath určujĆŗci tagy, ktorĆ© sa majĆŗ pridaÅ„ do obsahu na prvej Ćŗrovni. "
+"Ak je tento vĆ½raz Å”pecifikovanĆ½, mĆ” prednosÅ„ pred inĆ½mi formami autodetekcie."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
+msgid ""
+"XPath expression that specifies all tags that should be added to the Table "
+"of Contents at level two. Each entry is added under the previous level one "
+"entry."
+msgstr ""
+"VĆ½raz XPath určujĆŗci tagy, ktorĆ© sa majĆŗ pridaÅ„ do obsahu na druhej Ćŗrovni. "
+"KaždĆ½ zĆ”znam bude vloženĆ½ pod prĆ­sluÅ”nĆ½ prvoĆŗrovňovĆ½ zĆ”znam."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
+msgid ""
+"Path to a .ncx file that contains the table of contents to use for this "
+"ebook. The NCX file should contain links relative to the directory it is "
+"placed in. See http://www.niso.org/workrooms/daisy/Z39-86-2005.html#NCX for "
+"an overview of the NCX format."
+msgstr ""
+"Cesta k sĆŗboru .ncx s obsahom, ktorĆ½ sa mĆ” v tejto knihe použiÅ„. Tento sĆŗbor "
+"by mal obsahovaÅ„ odkazy relatĆ­vne k adresĆ”ru kde sa nachĆ”dza. Prehľad "
+"formƔtu NCX je na adrese http://www.niso.org/workrooms/daisy/Z39-86-"
+"2005.html#NCX"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
+msgid ""
+"Normally, if the source file already has a Table of Contents, it is used in "
+"preference to the autodetected one. With this option, the autodetected one "
+"is always used."
+msgstr ""
+"Za normĆ”lnych okolnostĆ­ je obsah, ktorĆ½ je sĆŗčasÅ„ou zdrojovĆ©ho sĆŗboru, vždy "
+"uprednostnenĆ½ pred automaticky generovanĆ½m. Zvolenie tejto možnosti spĆ“sobĆ­, "
+"že sa vždy použije automaticky generovanĆ½ obsah."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
+msgid "Control page layout"
+msgstr "Možnosti rozloženia strany"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
+msgid "Set the top margin in pts. Default is %default"
+msgstr "HornĆ½ okraj v bodoch. Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
+msgid "Set the bottom margin in pts. Default is %default"
+msgstr "DolnĆ½ okraj v bodoch. Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
+msgid "Set the left margin in pts. Default is %default"
+msgstr "ĽavĆ½ okraj v bodoch. Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
+msgid "Set the right margin in pts. Default is %default"
+msgstr "PravĆ½ okraj v bodoch. Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
+msgid ""
+"The base font size in pts. Default is %defaultpt. Set to 0 to disable "
+"rescaling of fonts."
+msgstr ""
+"ZĆ”kladnĆ” veľkosÅ„ pĆ­sma v bodoch. Å tandardnĆ” hodnota je %default. Hodnota 0 "
+"znemožnĆ­ zmenu veľkosti pĆ­sma."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
+msgid ""
+"Remove spacing between paragraphs. Will not work if the source file forces "
+"inter-paragraph spacing."
+msgstr ""
+"OdstrĆ”nenie rozostupov medzi odstavcami. Nebude maÅ„ žiaden Ćŗčinok pokiaľ "
+"vstupnĆ½ sĆŗbor explicitne Å”pecifikuje rozostupy odstavcov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
+msgid ""
+"Preserve the HTML tag structure while splitting large HTML files. This is "
+"only neccessary if the HTML files contain CSS that uses sibling selectors. "
+"Enabling this greatly slows down processing of large HTML files."
+msgstr ""
+"Zachovanie Å”truktĆŗry HTML blokov pri rozdeľovanĆ­ veľkĆ½ch HTML sĆŗborov. NutnĆ© "
+"len v prĆ­pade ak HTML sĆŗbor obsahuje CSS, ktorĆ© pouÅ¾Ć­va \"sibling "
+"selectors\". TĆ”to možnosÅ„ vĆ½razne predlžuje dobu spracovania veľkĆ½ch HTML "
+"sĆŗborov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
+msgid "Print generated OPF file to stdout"
+msgstr "VĆ½stup vygenerovanĆ©ho OPF sĆŗboru do stdout"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
+msgid "Print generated NCX file to stdout"
+msgstr "VĆ½stup vygenerovanĆ©ho NCX sĆŗboru do stdout"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
+msgid "Keep intermediate files during processing by html2epub"
+msgstr "ZachovaÅ„ dočasnĆ© sĆŗbory vygenerovanĆ© programom html2epub"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
+msgid ""
+"Extract the contents of the produced EPUB file to the specified directory."
+msgstr "RozbaliÅ„ obsah vytvorenĆ©ho EPUB sĆŗboru do určenĆ©ho adresĆ”ra."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
+msgid ""
+"%%prog [options] filename\n"
+"\n"
+"Convert any of a large number of ebook formats to a %s file. Supported "
+"formats are: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
+msgid "Could not find an ebook inside the archive"
+msgstr "V archĆ­ve nebola nĆ”jdenĆ” žiadna elektronickĆ” kniha"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Convert a HTML file to an EPUB ebook. Recursively follows links in the HTML "
+"file.\n"
+"If you specify an OPF file instead of an HTML file, the list of links is "
+"takes from\n"
+"the <spine> element of the OPF file.  \n"
+msgstr ""
+"%%prog [možnosti] sĆŗbor.html|opf\n"
+"\n"
+"Konverzia HTML sĆŗboru na elektronickĆŗ knihu vo formĆ”te EPUB. RekurzĆ­vne "
+"sleduje odkazy v HTML sĆŗbore.\n"
+"Ak miesto HTML sĆŗboru zadĆ”te OPF sĆŗbor, odkazy budĆŗ prevzatĆ© z jeho sekcie "
+"<spine>.  \n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
+msgid "You must specify an input HTML file"
+msgstr "MusĆ­te zadaÅ„ vstupnĆ½ HTML sĆŗbor"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/iterator.py:36
+msgid "%s format books are not supported"
+msgstr "ElektronickĆ© knihy vo formĆ”te %s nie sĆŗ podporovanĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:30
+msgid ""
+"Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
+msgstr ""
+"Nepodarilo sa nĆ”jsÅ„ vhodnĆ© miesto na rozdelenie: %s VeľkosÅ„ pod-stromu: %d KB"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
+msgid ""
+"\t\tToo much markup. Re-splitting without structure preservation. This may "
+"cause incorrect rendering."
+msgstr ""
+"\t\tPrĆ­liÅ” zložitĆ” Å”truktĆŗra sĆŗboru. Prerozdeľujem bez zachovania Å”truktĆŗry. "
+"SĆŗbor sa mĆ“Å¾e zobraziÅ„ nekorektne."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
+msgid "Written processed HTML to "
+msgstr "SpracovanƩ HTML bolo zapƭsanƩ do "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
+msgid "Options to control the traversal of HTML"
+msgstr "Možnosti spracovania HTML"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+msgid "The output directory. Default is the current directory."
+msgstr "VĆ½stupnĆ½ adresĆ”r. Å tandardne sa použije aktuĆ”lny pracovnĆ½ adresĆ”r."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+msgid "Character encoding for HTML files. Default is to auto detect."
+msgstr ""
+"KĆ³dovanie znakov v HTML sĆŗboru. Bez explicitne zadanej hodnoty bude "
+"detekovanƩ automaticky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+msgid ""
+"Create the output in a zip file. If this option is specified, the --output "
+"should be the name of a file not a directory."
+msgstr ""
+"VytvoriÅ„ vĆ½stup v sĆŗbore .zip. Ak je zvolenĆ” tĆ”to možnosÅ„, --output by mal "
+"byÅ„ nĆ”zov sĆŗboru, nie adresĆ”ra."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+msgid "Control the following of links in HTML files."
+msgstr "Nasledovanie odkazov v HTML sĆŗboroch."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+msgid ""
+"Traverse links in HTML files breadth first. Normally, they are traversed "
+"depth first"
+msgstr ""
+"PrechĆ”dzanie odkazov v HTML sĆŗboroch \"najprv do Å”Ć­rky\". Å tandardne sa "
+"odkazy prechĆ”dzajĆŗ \"najprv do hÄŗbky\"."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+msgid ""
+"Maximum levels of recursion when following links in HTML files. Must be non-"
+"negative. 0 implies that no links in the root HTML file are followed."
+msgstr ""
+"MaximĆ”lna hÄŗbka rekurzie pri prechĆ”dzanĆ­ odkazov v HTML sĆŗboroch. VyžadovanĆ” "
+"je pozitĆ­vna hodnota. 0 značƭ, že žiadne odkazy v koreňovom sĆŗbore nebudĆŗ "
+"prechƔdzanƩ."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+msgid "Set metadata of the generated ebook"
+msgstr "MetadƔta vygenerovanej elektronickej knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+msgid "Set the title. Default is to autodetect."
+msgstr "NĆ”zov. Å tandardne automaticky detekovanĆ½."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+msgid "The author(s) of the ebook, as a comma separated list."
+msgstr "Autor(i) knihy, oddelenƭ čiarkami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
+msgid "The subject(s) of this book, as a comma separated list."
+msgstr "TĆ©my tejto knihy, oddelenĆ© čiarkami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
+msgid "Set the publisher of this book."
+msgstr "Vydavateľ knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+msgid "A summary of this book."
+msgstr "StručnĆ½ obsah knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
+msgid "Load metadata from the specified OPF file"
+msgstr "SĆŗbor OPF z ktorĆ©ho sa majĆŗ prevziaÅ„ metadĆ”ta."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
+msgid "Options useful for debugging"
+msgstr "Možnosti užitočnĆ© pri hľadanĆ­ chĆ½b v programe."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
+msgid ""
+"Be more verbose while processing. Can be specified multiple times to "
+"increase verbosity."
+msgstr ""
+"Pri spracovanĆ­ vypisovaÅ„ viac informĆ”ciĆ­. ViacnĆ”sobnĆ© použitie ďalej zvyÅ”uje "
+"množstvo zobrazenĆ½ch informĆ”ciĆ­."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
+msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
+msgstr "VĆ½stupnĆ½ HTML sĆŗbor bude Ćŗhľadne formĆ”tovanĆ½ pre uľahčenie čƭtania."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
+msgid ""
+"%prog [options] file.html|opf\n"
+"\n"
+"Follow all links in an HTML file and collect them into the specified "
+"directory.\n"
+"Also collects any references resources like images, stylesheets, scripts, "
+"etc. \n"
+"If an OPF file is specified instead, the list of files in its <spine> "
+"element\n"
+"is used.\n"
+msgstr ""
+"%prog [možnosti] sĆŗbor.html|opf\n"
+"\n"
+"Odkazy v HTML sĆŗbore budĆŗ zozbieranĆ© do uvedenĆ©ho adresĆ”ra.\n"
+"Rovnako aj vÅ”etky pridruženĆ© materiĆ”ly ako obrĆ”zky, sĆŗbory Å”tĆ½lov CSS, "
+"skripty a pod. \n"
+"Ak je vstupnĆ½ sĆŗbor typu OPF, bude miesto odkazov spracovanĆ½ zoznam sĆŗborov "
+"v bloku <spine>.\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr "%prog [možnosti] LITsĆŗbor"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr "VĆ½stupnĆ½ adresĆ”r. Å tandardne aktuĆ”lny pracovnĆ½ adresĆ”r."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+"Čitateľne formĆ”tovaÅ„ extrahovanĆ© HTML. MĆ“Å¾e ovplyvniÅ„ medzery v texte."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
+msgid "Useful for debugging."
+msgstr "UžitočnĆ© pri hľadanĆ­ chĆ½b v programe."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
+msgid "OEB ebook created in"
+msgstr "OEB elektronickĆ” kniha bude vytvorenĆ” v"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
+msgid "Set the title. Default: filename."
+msgstr "NĆ”zov knihy. Å tandardne sa použije nĆ”zov sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:76
+msgid ""
+"Set the author(s). Multiple authors should be set as a comma separated list. "
+"Default: %default"
+msgstr ""
+"Autori knihy. ViacerĆ­ autori by mali byÅ„ oddelenĆ­ čiarkami. Å tandardnĆ” "
+"hodnota: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+msgid "Set the comment."
+msgstr "PoznƔmka"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+msgid "Set the category"
+msgstr "KategĆ³ria knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:83
+msgid "Sort key for the title"
+msgstr "NƔzov, v tvare vhodnom pre triedenie"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:85
+msgid "Sort key for the author"
+msgstr "Autor, v tvare vhodnom pre triedenie (priezvisko, meno)"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
+msgid "Publisher"
+msgstr "Vydavateľ"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:89
+msgid "Path to file containing image to be used as cover"
+msgstr "Cesta k obrazovĆ©mu sĆŗboru, ktorĆ½ mĆ” byÅ„ použitĆ½ ako obĆ”lka knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:91
+msgid ""
+"If there is a cover graphic detected in the source file, use that instead of "
+"the specified cover."
+msgstr ""
+"Ak bude vo vstupnom sĆŗbore nĆ”jdenĆ” obĆ”lka knihy, bude použitĆ” namiesto "
+"uvedenej obƔlky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:94
+msgid "Output file name. Default is derived from input filename"
+msgstr ""
+"NĆ”zov vĆ½stupnĆ©ho sĆŗboru. Å tandardne bude odvodenĆ½ od nĆ”zvu vstupnĆ©ho sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:96
+msgid ""
+"Render HTML tables as blocks of text instead of actual tables. This is "
+"neccessary if the HTML contains very large or complex tables."
+msgstr ""
+"ZobraziÅ„ HTML tabuľky ako bloky textu namiesto skutočnĆ½ch tabuliek. PotrebnĆ© "
+"v prĆ­pade ak HTML obsahuje veľmi veľkĆ© alebo komplexnĆ© tabuľky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:99
+msgid ""
+"Specify the base font size in pts. All fonts are rescaled accordingly. This "
+"option obsoletes the --font-delta option and takes precedence over it. To "
+"use --font-delta, set this to 0. Default: %defaultpt"
+msgstr ""
+"ZĆ”kladnĆ” veľkosÅ„ pĆ­sma v bodoch. VÅ”etky pĆ­sma budĆŗ prĆ­sluÅ”ne zvĆ¤ÄÅ”enĆ© alebo "
+"zmenÅ”enĆ©. TĆ”to možnosÅ„ nahrĆ”dza --font-delta a mĆ” pred ňou prednosÅ„. Ak "
+"chete použiÅ„ --font-delta, nastavte tĆŗto hodnotu na 0. Å tandardnĆ” hodnota: "
+"%default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:101
+msgid "Enable autorotation of images that are wider than the screen width."
+msgstr ""
+"PovoliÅ„ automatickĆ© otĆ”Äanie obrĆ”zkov Å”irÅ”Ć­ch než je Å”Ć­rka obrazovky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:104
+msgid "Set the space between words in pts. Default is %default"
+msgstr "Medzery medzi slovami v bodoch. Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:106
+msgid "Separate paragraphs by blank lines."
+msgstr "Oddelenie odstavcov prƔzdnymi riadkami."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:108
+msgid "Add a header to all the pages with title and author."
+msgstr "Ku každej strane pridaÅ„ hlavičku s nĆ”zvom knihy a menom autora."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:110
+msgid ""
+"Set the format of the header. %a is replaced by the author and %t by the "
+"title. Default is %default"
+msgstr ""
+"FormĆ”t hlavičky. %a bude nahradenĆ© menom autora, %t nĆ”zvom knihy. Å tandardnĆ” "
+"hlavička je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:112
+msgid ""
+"Override the CSS. Can be either a path to a CSS stylesheet or a string. If "
+"it is a string it is interpreted as CSS."
+msgstr ""
+"Nahradenie CSS. MĆ“Å¾e byÅ„ buď cesta k sĆŗboru CSS alebo reÅ„azec. ReÅ„azec bude "
+"interpretovanĆ½ ako CSS."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:114
+msgid ""
+"Use the <spine> element from the OPF file to determine the order in which "
+"the HTML files are appended to the LRF. The .opf file must be in the same "
+"directory as the base HTML file."
+msgstr ""
+"Na určenie poradia, v ktorom budĆŗ k LRF sĆŗboru pripojenĆ© HTML sĆŗbory, bude "
+"použitĆ½ blok <spine> OPF sĆŗboru. SĆŗbor .opf musĆ­ byÅ„ v rovnakom adresĆ”ri ako "
+"zĆ”kladnĆ½ HTML sĆŗbor."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:116
+msgid ""
+"Minimum paragraph indent (the indent of the first line of a paragraph) in "
+"pts. Default: %default"
+msgstr ""
+"MinimƔlne odsadenie odstavca (odsadenie prvƩho riadka odstavca) v bodoch. "
+"Å tandardnĆ” hodnota: %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:118
+msgid ""
+"Increase the font size by 2 * FONT_DELTA pts and the line spacing by "
+"FONT_DELTA pts. FONT_DELTA can be a fraction.If FONT_DELTA is negative, the "
+"font size is decreased."
+msgstr ""
+"ZvĆ¤ÄÅ”enie veľkosti pĆ­sma o 2 * FONT_DELTA bodov a rozostupu riadkov o "
+"FONT_DELTA bodov. FONT_DELTA nemusĆ­ byÅ„ celĆ© čislo. Ak je hodnota FONT_DELTA "
+"zĆ”pornĆ”, veľkosÅ„ pĆ­sma sa zmenÅ”Ć­."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:123
+msgid ""
+"Render all content as black on white instead of the colors specified by the "
+"HTML or CSS."
+msgstr ""
+"Zobrazenie obsahu v čiernej farbe na bielom pozadƭ, namiesto farieb "
+"uvedenĆ½ch v HTML alebo CSS."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:129
+msgid ""
+"Profile of the target device for which this LRF is being generated. The "
+"profile determines things like the resolution and screen size of the target "
+"device. Default: %s Supported profiles: "
+msgstr ""
+"Profil cieľovĆ©ho zariadenia, pre ktorĆ© je tento LRF sĆŗbor určenĆ½. Profil "
+"určuje charakteristiky zariadenia, ako naprĆ­klad rozlĆ­Å”enie alebo veľkosÅ„ "
+"obrazovky. Å tandardnĆ½ profil: %s PodporovanĆ© profily: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:135
+msgid "Left margin of page. Default is %default px."
+msgstr "ĽavĆ½ okraj strany. Å tandardnĆ½ okraj je %defaul obrazovĆ½ch bodov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:137
+msgid "Right margin of page. Default is %default px."
+msgstr "PravĆ½ okraj strany. Å tandardnĆ½ okraj je %defaul obrazovĆ½ch bodov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:139
+msgid "Top margin of page. Default is %default px."
+msgstr "HornĆ½ okraj strany. Å tandardnĆ½ okraj je %defaul obrazovĆ½ch bodov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:141
+msgid "Bottom margin of page. Default is %default px."
+msgstr "DolnĆ½ okraj strany. Å tandardnĆ½ okraj je %defaul obrazovĆ½ch bodov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:143
+msgid ""
+"Render tables in the HTML as images (useful if the document has large or "
+"complex tables)"
+msgstr ""
+"Zobrazenie HTML tabuliek v podobe obrĆ”zkov (užitočnĆ© ak dokument obsahuje "
+"veľkĆ© alebo zložitĆ© tabuľky)"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:145
+msgid ""
+"Multiply the size of text in rendered tables by this factor. Default is "
+"%default"
+msgstr ""
+"Faktor znĆ”sobenia veľkosti pĆ­sma v zobrazenĆ½ch tabuľkĆ”ch. Å tandardnĆ” hodnota "
+"je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:150
+msgid ""
+"The maximum number of levels to recursively process links. A value of 0 "
+"means thats links are not followed. A negative value means that <a> tags are "
+"ignored."
+msgstr ""
+"MaximĆ”lna hÄŗbka rekurzie pri spracovanĆ­ odkazov. Hodnota 0 znamenĆ”, že "
+"odkazy nebudĆŗ nasledovanĆ©. ZĆ”pornĆ” hodnota spĆ“sobĆ­, že bloky <a> budĆŗ Ćŗplne "
+"preskočenĆ©."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:154
+msgid ""
+"A regular expression. <a> tags whose href matches will be ignored. Defaults "
+"to %default"
+msgstr ""
+"RegulĆ”rny vĆ½raz. <a> bloky zhodujĆŗce sa s tĆ½mto vĆ½razom budĆŗ ignorovanĆ©. "
+"Å tandardne %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:158
+msgid "Don't add links to the table of contents."
+msgstr "NepridĆ”vaÅ„ odkazy do obsahu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:162
+msgid "Prevent the automatic detection chapters."
+msgstr "ZakĆ”zaÅ„ automatickĆ© rozoznĆ”vanie kapitol."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:165
+msgid ""
+"The regular expression used to detect chapter titles. It is searched for in "
+"heading tags (h1-h6). Defaults to %default"
+msgstr ""
+"RegulĆ”rny vĆ½raz na automatickĆ© rozoznĆ”vanie nĆ”zvov kapitol. Bude hľadanĆ½ v "
+"nadpisovĆ½ch blokoch (h1-h6). Å tandardne %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:168
+msgid ""
+"Detect a chapter beginning at an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". You can set the "
+"attribute to \"none\" to match only on tag names. So for example, to match "
+"all h2 tags, you would use \"h2,none,\". Default is %default"
+msgstr ""
+"Automaticky rozoznaÅ„ element s uvedenĆ½m atribĆŗtom ako začiatok kapitoly. "
+"FormĆ”t tohto parametra je \"reg. vĆ½raz tagu,nĆ”zov atribĆŗtu,reg. vĆ½raz "
+"hodnoty atribĆŗtu\". NaprĆ­klad, na nĆ”jdenie vÅ”etkĆ½ch nadpisovĆ½ch tagov s "
+"atribĆŗtom class=\"chapter\" zadajte \"h\\d,class,chapter\". UvedenĆ­m "
+"atribĆŗtu \"none\" mĆ“Å¾ete obmedziÅ„ porovnĆ”vanie len na nĆ”zvy tagov. "
+"NaprĆ­klad, ak si želĆ”te nĆ”jsÅ„ vÅ”etky h2 tagy, zadajte \"h2,none,\". "
+"Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:170
+msgid ""
+"If html2lrf does not find any page breaks in the html file and cannot detect "
+"chapter headings, it will automatically insert page-breaks before the tags "
+"whose names match this regular expression. Defaults to %default. You can "
+"disable it by setting the regexp to \"$\". The purpose of this option is to "
+"try to ensure that there are no really long pages as this degrades the page "
+"turn performance of the LRF. Thus this option is ignored if the current page "
+"has only a few elements."
+msgstr ""
+"Keď html2lrf nenĆ”jde v sĆŗbore žiadne zalomenia strĆ”n a nerozoznĆ” ani žiadne "
+"nadpisy kapitol, automaticky vloÅ¾Ć­ zalomenia strĆ”n pred tagy, ktorĆ½ch nĆ”zvy "
+"sa zhodujĆŗ s tĆ½mto regulĆ”rnym vĆ½razom. Å tandardnĆ” hodnota je %default. Tento "
+"mechanizmus mĆ“Å¾ete vypnĆŗÅ„ zadanĆ­m vĆ½razu \"$\". Jeho zmyslom je zabrĆ”niÅ„ "
+"vzniku veľmi dlhĆ½ch Ćŗsekov bez zalomenia strany, ktorĆ© znižujĆŗ rĆ½chlosÅ„ "
+"listovania v LRF sĆŗbore. TĆ”to možnosÅ„ je teda ignorovanĆ” ak aktuĆ”lna strĆ”nka "
+"mƔ len pƔr elementov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:180
+msgid ""
+"Force a page break before tags whose names match this regular expression."
+msgstr ""
+"VložiÅ„ zalomenie strany pred tagmi, ktorĆ½ch nĆ”zvy sa zhodujĆŗ s tĆ½mto "
+"regulĆ”rnym vĆ½razom."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:182
+msgid ""
+"Force a page break before an element having the specified attribute. The "
+"format for this option is tagname regexp,attribute name,attribute value "
+"regexp. For example to match all heading tags that have the attribute "
+"class=\"chapter\" you would use \"h\\d,class,chapter\". Default is %default"
+msgstr ""
+"VložiÅ„ zalomenie strany pred prvkami, ktorĆ© majĆŗ uvedenĆ½ atribĆŗt. FormĆ”t "
+"tohto parametra je \"reg. vĆ½raz tagu,nĆ”zov atribĆŗtu,reg. vĆ½raz hodnoty "
+"atribĆŗtu\". NaprĆ­klad, na nĆ”jdenie vÅ”etkĆ½ch nadpisovĆ½ch tagov s atribĆŗtom "
+"class=\"chapter\" zadajte \"h\\d,class,chapter\". Å tandardnĆ” hodnota je "
+"%default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:185
+msgid "Add detected chapters to the table of contents."
+msgstr "Pridanie automaticky nĆ”jdenĆ½ch kapitol do obsahu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:188
+msgid "Preprocess Baen HTML files to improve generated LRF."
+msgstr ""
+"Predpripravenie HTML sĆŗborov z vydavateľstva BAEN na zlepÅ”enie kvality "
+"vĆ½stupnĆ©ho LRF sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:190
+msgid ""
+"You must add this option if processing files generated by pdftohtml, "
+"otherwise conversion will fail."
+msgstr ""
+"TĆ”to možnosÅ„ musĆ­ byÅ„ aktivovanĆ” pri spracovanĆ­ sĆŗborov vytvorenĆ½ch "
+"programom pdftohtml. V opačnom prĆ­pade konverzia zlyhĆ”."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:192
+msgid "Use this option on html0 files from Book Designer."
+msgstr ""
+"TĆ”to možnosÅ„ by mala byÅ„ použitĆ” pri spracovanĆ­ html0 sĆŗborov z programu "
+"Book Designer."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:195
+msgid ""
+"Specify trutype font families for serif, sans-serif and monospace fonts. "
+"These fonts will be embedded in the LRF file. Note that custom fonts lead to "
+"slower page turns. For example: --serif-family \"Times New Roman\"\n"
+"    "
+msgstr ""
+"TrueType fonty pre pƤtkovƩ, bezpƤtkovƩ a neproporcionƔlne pƭsmo. Tieto fonty "
+"budĆŗ vsadenĆ© do LRF sĆŗboru. Majte na pamƤti, že neÅ”tandardnĆ© fonty zvĆ¤ÄÅ”a "
+"spomaľujĆŗ listovanie v knihe. PrĆ­klad: --serif-family \"Times New Roman\"\n"
+"    "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:203
+msgid "The serif family of fonts to embed"
+msgstr "Font pre pƤtkovƩho pƭsmo"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:206
+msgid "The sans-serif family of fonts to embed"
+msgstr "Font pre bezpƤtkovƩ pƭsmo"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:209
+msgid "The monospace family of fonts to embed"
+msgstr "Font pre nepropocionƔlne pƭsmo"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:213
+msgid "Be verbose while processing"
+msgstr "ZvĆ½Å”iÅ„ množstvo Ćŗdajov zobrazovanĆ½ch počas spracovania"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:215
+msgid "Convert to LRS"
+msgstr "Previesń do LRS"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:217
+msgid ""
+"Minimize memory usage at the cost of longer processing times. Use this "
+"option if you are on a memory constrained machine."
+msgstr ""
+"ZnĆ­Å¾iÅ„ požiadavky na veľkosÅ„ pamƤte, vĆ½menou za pomalÅ”ie spracovanie. TĆ”to "
+"možnosÅ„ je užitočnĆ” pre počƭtače s obmedzenou kapacitou pamƤte."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:219
+msgid ""
+"Specify the character encoding of the source file. If the output LRF file "
+"contains strange characters, try changing this option. A common encoding for "
+"files from windows computers is cp-1252. Another common choice is utf-8. The "
+"default is to try and guess the encoding."
+msgstr ""
+"KĆ³dovanie znakov vstupnĆ©ho sĆŗboru. Ak vĆ½stupnĆ½ LRF sĆŗbor obsahuje "
+"nečitateľnĆ© znaky, skĆŗste zmeniÅ„ tento parameter. Často pouÅ¾Ć­vanĆ© kĆ³dovanie "
+"znakov na počƭtačoch s operačnĆ½m systĆ©mom Windows je cp-1252. ĎalÅ”ia často "
+"pouÅ¾Ć­vanĆ” možnosÅ„ je utf-8. Program sa Å”tandardne pokĆŗsi rozoznaÅ„ použitĆ© "
+"kĆ³dovanie automaticky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
+msgid "Converting from %s to LRF is not supported."
+msgstr "Prevod z %s do LRF nie je podporovanĆ½."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
+msgid ""
+"any2lrf [options] myfile\n"
+"\n"
+"Convert any ebook format into LRF. Supported formats are:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC and PDF. any2lrf will also process a "
+"RAR or\n"
+"ZIP archive, looking for an ebook inside the archive.\n"
+"    "
+msgstr ""
+"any2lrf [možnosti] sĆŗbor\n"
+"\n"
+"Prevod elektronickej knihy do formĆ”tu LRF. MožnĆ© vstupnĆ© formĆ”ty sĆŗ:\n"
+"LIT, RTF, TXT, HTML, EPUB, MOBI, PRC a PDF. any2lrf podporuje aj RAR alebo\n"
+"ZIP archĆ­vy, v ktorĆ½ch bude hľadaÅ„ knihy v uvedenĆ½ch formĆ”toch.\n"
+"    "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
+msgid "No file to convert specified."
+msgstr "Nebol uvedenĆ½ žiaden vstupnĆ½ sĆŗbor."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+msgid "Rendered %s"
+msgstr "ƚspeÅ”nĆ½ prevod %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
+msgid "Failed %s"
+msgstr "Neuspel prevod %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
+msgid ""
+"Failed to process comic: %s\n"
+"\n"
+"%s"
+msgstr ""
+"Nepodarilo sa previesń komiks: %s\n"
+"\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
+msgid ""
+"Options to control the conversion of comics (CBR, CBZ) files into ebooks"
+msgstr "Možnosti prevodu komiksov (CBR, CBZ) do podoby elektronickĆ½ch knĆ­h"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
+msgid "Title for generated ebook. Default is to use the filename."
+msgstr ""
+"NĆ”zov vytvorenej elektronickej knihy. Å tandardne sa použije nĆ”zov sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+"Autor, ktorĆ½ bude uvedenĆ½ v metadĆ”tach vytvorenej elektronickej knihy. "
+"Å tandardnĆ” hodnota je %default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
+"Path to output file. By default a file is created in the current directory."
+msgstr ""
+"Cesta k vĆ½stupnĆ©mu sĆŗboru. Å tandardne bude vĆ½stupnĆ½ sĆŗbor vytvorenĆ½ v "
+"aktuƔlnom pracovnom adresƔri."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
+msgid "Number of colors for grayscale image conversion. Default: %default"
+msgstr ""
+"Počet odtieňov sivej použitĆ½ pri prevode obrĆ”zkov. Å tandardnĆ” hodnota: "
+"%default"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
+msgid ""
+"Disable normalize (improve contrast) color range for pictures. Default: False"
+msgstr ""
+"Vypnutie normalizĆ”cie (zvĆ½Å”enia kontrastu) rozsahu farieb obrĆ”zkov. "
+"Å tandardne je normalizĆ”cia zapnutĆ”."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
+msgid "Maintain picture aspect ratio. Default is to fill the screen."
+msgstr ""
+"ZachovaÅ„ pomer strĆ”n obrĆ”zkov. Å tandardne obrĆ”zky vyplnia celĆŗ obrazovku."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
+msgid "Disable sharpening."
+msgstr "VypnĆŗÅ„ zvyÅ”ovanie ostrosti obrĆ”zkov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
+msgid "Don't split landscape images into two portrait images"
+msgstr "NerozdeľovaÅ„ obrĆ”zky \"na Å”Ć­rku\" na dva obrĆ”zky \"na vĆ½Å”ku\"."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
+msgid ""
+"Keep aspect ratio and scale image using screen height as image width for "
+"viewing in landscape mode."
+msgstr ""
+"ZachovaÅ„ pomer strĆ”n a prispĆ“sobiÅ„ Å”Ć­rku obrĆ”zka vĆ½Å”ke obrazovky na "
+"prezeranie \"na Å”Ć­rku\"."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
+msgid ""
+"Used for right-to-left publications like manga. Causes landscape pages to be "
+"split into portrait pages from right to left."
+msgstr ""
+"UžitočnĆ© pre publikĆ”cie čƭtanĆ© zprava doľava, ako napr. manga. ObrĆ”zky \"na "
+"Å”Ć­rku\" budĆŗ rozdelenĆ© na obrĆ”zky \"na vĆ½Å”ku\" v poradĆ­ zprava doľava."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
+msgid ""
+"Enable Despeckle. Reduces speckle noise. May greatly increase processing "
+"time."
+msgstr ""
+"ZapnĆŗÅ„ filter Å”umu. Odstraňuje Å”um v oblastiach plynulĆ½ch prechodov. MĆ“Å¾e "
+"vĆ½razne predÄŗžiÅ„ čas potrebnĆ½ na spracovanie."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
+msgid ""
+"Don't sort the files found in the comic alphabetically by name. Instead use "
+"the order they were added to the comic."
+msgstr ""
+"NetriediÅ„ sĆŗbory komiksu abecedne. PoužiÅ„ poradie v ktorom boli pridanĆ© do "
+"komiksu."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
+msgid ""
+"Choose a profile for the device you are generating this file for. The "
+"default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
+"suitable for any reader with the same screen size. Choices are %s"
+msgstr ""
+"Profil zariadenia, pre ktorĆ© je tento sĆŗbor určenĆ½. Å tandardnĆ½ profil je "
+"SONY PRS-500 s rozlĆ­Å”enĆ­m obrazovky 584x754 obrazovĆ½ch bodov. Tento profil "
+"je vhodnĆ½ pre akĆ©koľvek čƭtacie zariadenie s rovnakĆ½m rozlĆ­Å”enĆ­m obrazovky. "
+"Možnosti sĆŗ %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
+msgid ""
+"Be verbose, useful for debugging. Can be specified multiple times for "
+"greater verbosity."
+msgstr ""
+"ZvĆ½Å”iÅ„ množstvo zobrazovanĆ½ch Ćŗdajov, čo je užitočnĆ© pri hľadanĆ­ chĆ½b v "
+"programe. Pri viacnĆ”sobnom použitĆ­ sa množstvo zobrazovanĆ½ch Ćŗdajov ďalej "
+"zvyŔuje."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
+msgid "Don't show progress bar."
+msgstr "NezobrazovaÅ„ indikĆ”tor postupu spracovania."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
+msgid ""
+"%prog [options] comic.cb[z|r]\n"
+"\n"
+"Convert a comic in a CBZ or CBR file to an ebook. \n"
+msgstr ""
+"%prog [možnosti] komiks.cb[z|r]\n"
+"\n"
+"PreviesÅ„ komiks vo formĆ”te CBZ alebo CBR do podoby elektronickej knihy. \n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
+msgid "Output written to"
+msgstr "VĆ½stup do"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
+msgid "Rendering comic pages..."
+msgstr "SpracĆŗvam strĆ”nky komiksu..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/epub/convert_from.py:17
+msgid ""
+"Usage: %prog [options] mybook.epub\n"
+"        \n"
+"        \n"
+"%prog converts mybook.epub to mybook.lrf"
+msgstr ""
+"Použitie: %prog [možnosti] kniha.epub\n"
+"        \n"
+"        \n"
+"%prog prevedie kniha.epub do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:23
+msgid ""
+"%prog [options] mybook.fb2\n"
+"\n"
+"\n"
+"%prog converts mybook.fb2 to mybook.lrf"
+msgstr ""
+"%prog [možnosti] kniha.fb2\n"
+"\n"
+"\n"
+"%prog prevedie kniha.fb2 do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:28
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:24
+msgid "Print generated HTML to stdout and quit."
+msgstr "VypĆ­saÅ„ vytvorenĆ© HTML do stdout a skončiÅ„."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:30
+msgid "Keep generated HTML files after completing conversion to LRF."
+msgstr "ZachovaÅ„ HTML sĆŗbory po dokončenĆ­ prevodu do LRF."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:20
+msgid "Options to control the behavior of feeds2disk"
+msgstr "Možnosti ovlĆ”dajĆŗce sprĆ”vanie programu feeds2disk"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:22
+msgid "Options to control the behavior of html2lrf"
+msgstr "Možnosti ovlĆ”dajĆŗce sprĆ”vanie programu html2lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/feeds/convert_from.py:44
+msgid "Fetching of recipe failed: "
+msgstr "Preberanie receptu zlyhalo: "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+msgid "\tBook Designer file detected."
+msgstr "\tBol rozoznanĆ½ sĆŗbor z programu Book Designer."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
+msgid "\tParsing HTML..."
+msgstr "\tSpracĆŗvam HTML..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
+msgid "\tBaen file detected. Re-parsing..."
+msgstr ""
+"\tBol rozoznanĆ½ sĆŗbor z vydavateľstva BAEN. ReÅ”tartujem spracovanie..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
+msgid "Written preprocessed HTML to "
+msgstr "PredspracovanĆ½ HTML sĆŗbor bol zapĆ­sanĆ½ do "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
+msgid "Processing %s"
+msgstr "SpracĆŗvam %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
+msgid "\tConverting to BBeB..."
+msgstr "\tPrevƔdzam do BBeB..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
+msgid "Could not parse file: %s"
+msgstr "Spracovanie sĆŗboru zlyhalo: %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
+msgid "%s is an empty file"
+msgstr "%s je prĆ”zdny sĆŗbor"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
+msgid "Failed to parse link %s %s"
+msgstr "Zlyhalo spracovanie odkazu %s %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
+msgid "Cannot add link %s to TOC"
+msgstr "Nepodarilo sa pridań odkaz %s do obsahu"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
+msgid "Unable to process image %s. Error: %s"
+msgstr "Spracovanie obrƔzku %s zlyhalo. Chyba: %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
+msgid "Unable to process interlaced PNG %s"
+msgstr "Zlyhalo spracovanie prekladanƩho PNG obrƔzku %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
+msgid ""
+"Could not process image: %s\n"
+"%s"
+msgstr ""
+"Zlyhalo spracovanie obrƔzka: %s\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
+msgid ""
+"An error occurred while processing a table: %s. Ignoring table markup."
+msgstr "Chyba pri spracovanĆ­ tabuľky: %s. Ignorujem blok tabuľky."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
+msgid ""
+"Bad table:\n"
+"%s"
+msgstr ""
+"NesprĆ”vna definĆ­cia tabuľky:\n"
+"%s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
+msgid "Table has cell that is too large"
+msgstr "Tabuľka obsahuje bunku, ktorĆ” je prĆ­liÅ” veľkĆ”"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
+msgid ""
+"You have to save the website %s as an html file first and then run html2lrf "
+"on it."
+msgstr ""
+"WebovĆŗ strĆ”nku je potrebnĆ© najprv uložiÅ„ ako HTML sĆŗbor, potom previesÅ„ "
+"programom html2lrf."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
+msgid "Could not read cover image: %s"
+msgstr "Nepodarilo sa načƭtaÅ„ obrĆ”zok obĆ”lky: %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
+msgid "Cannot read from: %s"
+msgstr "NemĆ“Å¾em čƭtaÅ„ z: %s"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
+msgid "Failed to process opf file"
+msgstr "Zlyhalo spracovanie OPF sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
+msgid ""
+"Usage: %prog [options] mybook.html\n"
+"\n"
+"\n"
+"%prog converts mybook.html to mybook.lrf. \n"
+"%prog follows all links in mybook.html that point \n"
+"to local files recursively. Thus, you can use it to \n"
+"convert a whole tree of HTML files."
+msgstr ""
+"%prog [možnosti] kniha.html\n"
+"\n"
+"\n"
+"%prog prevedie kniha.html do kniha.lrf. \n"
+"%prog bude rekurzĆ­vne prechĆ”dzaÅ„ odkazy \n"
+"v kniha.html, ktorĆ© smerujĆŗ k lokĆ”lnym sĆŗborom, \n"
+"takže je možnĆ© previesÅ„ celĆ½ strom HTML \n"
+"sĆŗborov naraz."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lit/convert_from.py:15
+msgid ""
+"Usage: %prog [options] mybook.lit\n"
+"\n"
+"\n"
+"%prog converts mybook.lit to mybook.lrf"
+msgstr ""
+"%prog [možnosti] kniha.lit\n"
+"\n"
+"\n"
+"%prog prevedie kniha.lit do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:134
+msgid ""
+"%prog book.lrf\n"
+"Convert an LRF file into an LRS (XML UTF-8 encoded) file"
+msgstr ""
+"%prog [možnosti] kniha.lrf\n"
+"Prevod LRF sĆŗboru do LRS (XML s UTF-8 kĆ³dovanĆ­m)"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:135
+msgid "Output LRS file"
+msgstr "VĆ½stupnĆ½ LRS sĆŗbor"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:153
+msgid "Parsing LRF..."
+msgstr "SpracĆŗvam LRF..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:156
+msgid "Creating XML..."
+msgstr "VytvƔram XML..."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrfparser.py:158
+msgid "LRS written to "
+msgstr "LRS zapƭsanƩ do "
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:249
+msgid "Could not read from thumbnail file:"
+msgstr "Nepodarilo sa načƭtaÅ„ nĆ”hľad:"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:269
+msgid ""
+"%prog [options] file.lrs\n"
+"Compile an LRS file into an LRF file."
+msgstr ""
+"%prog [možnosti] sĆŗbor.lrs\n"
+"Prevod LRS sĆŗboru do formĆ”tu LRF."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:270
+msgid "Path to output file"
+msgstr "Cesta k vĆ½stupnĆ©mu sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:272
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:115
+msgid "Verbose processing"
+msgstr "ZvĆ½Å”iÅ„ množstvo vypisovanĆ½ch informĆ”ciĆ­"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/lrs/convert_from.py:274
+msgid "Convert LRS to LRS, useful for debugging."
+msgstr "PreviesÅ„ LRS na LRS, užitočnĆ© pri hľadanĆ­ chĆ½b v programe."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:455
+msgid "Invalid LRF file. Could not set metadata."
+msgstr "NeplatnĆ½ LRF sĆŗbor. Nepodarilo sa prepĆ­saÅ„ metadĆ”ta."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:580
+msgid ""
+"%prog [options] mybook.lrf\n"
+"\n"
+"\n"
+"Show/edit the metadata in an LRF file.\n"
+"\n"
+msgstr ""
+"%prog [možnosti] kniha.lrf\n"
+"\n"
+"\n"
+"Zobrazenie/zmena metadĆ”t v LRF sĆŗbore.\n"
+"\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:587
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:40
+msgid "Set the book title"
+msgstr "NƔzov knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:589
+msgid "Set sort key for the title"
+msgstr "NƔzov knihy v tvare vhodnom pre triedenie"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:591
+msgid "Set the author"
+msgstr "Meno autora"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:593
+msgid "Set sort key for the author"
+msgstr "Meno autora v tvare vhodnom pre triedenie (priezvisko, meno)"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:595
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:44
+msgid "The category this book belongs to. E.g.: History"
+msgstr "KategĆ³ria, do ktorej tĆ”to kniha patrĆ­. Napr.: Dejiny"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:598
+msgid "Path to a graphic that will be set as this files' thumbnail"
+msgstr "Cesta k obrazovĆ©mu sĆŗboru, ktorĆ½ bude použitĆ½ ako nĆ”hľad"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:601
+msgid ""
+"Path to a txt file containing the comment to be stored in the lrf file."
+msgstr "Cesta k TXT sĆŗboru s poznĆ”mkami, ktorĆ© sa majĆŗ vložiÅ„ do LRF sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:605
+msgid "Extract thumbnail from LRF file"
+msgstr "PrevziaÅ„ nĆ”hľad z LRF sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:607
+msgid ""
+"Extract cover from LRF file. Note that the LRF format has no defined cover, "
+"so we use some heuristics to guess the cover."
+msgstr ""
+"PrevziaÅ„ obĆ”lku z LRF sĆŗboru. Majte na pamƤti, že formĆ”t LRF nemĆ” pevne "
+"definovanĆŗ obĆ”lku, takže na jej nĆ”jdenie bude použitĆ” heuristickĆ” metĆ³da."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:609
+msgid "Set book ID"
+msgstr "IdentifikačnĆ½ kĆ³d knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/meta.py:611
+msgid "Don't know what this is for"
+msgstr "ƚčel tejto položky nie je znĆ”my"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/mobi/convert_from.py:43
+msgid ""
+"Usage: %prog [options] mybook.mobi|prc\n"
+"\n"
+"\n"
+"%prog converts mybook.mobi to mybook.lrf"
+msgstr ""
+"Použitie: %prog [možnosti] kniha.mobi|prc\n"
+"\n"
+"\n"
+"%prog prevedie kniha.mobi do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:47
+msgid "Could not find pdftohtml, check it is in your PATH"
+msgstr ""
+"Nepodarilo sa nĆ”jsÅ„ pdftohtml, uistite sa či je cesta k nemu v systĆ©movej "
+"premennej PATH"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:61
+msgid ""
+" is an image based PDF. Only conversion of text based PDFs is supported."
+msgstr ""
+" je PDF so stranami vo forme obrĆ”zkov. Je možnĆ½ len prevod textovĆ½ch PDF "
+"sĆŗborov."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:80
+msgid ""
+"%prog [options] mybook.pdf\n"
+"\n"
+"\n"
+"%prog converts mybook.pdf to mybook.lrf"
+msgstr ""
+"%prog [možnosti] kniha.pdf\n"
+"\n"
+"\n"
+"%prog prevedie kniha.pdf do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:403
+msgid ""
+"Path to output directory in which to create the HTML file. Defaults to "
+"current directory."
+msgstr ""
+"Cesta k adresĆ”ru, v ktorom sa mĆ” vytvoriÅ„ vĆ½stupnĆ½ HTML sĆŗbor. Å tandardne je "
+"to aktuĆ”lny pracovnĆ½ adresĆ”r."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:405
+msgid "Be more verbose."
+msgstr "VypisovaÅ„ viac informĆ”ciĆ­."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/reflow.py:417
+msgid "You must specify a single PDF file."
+msgstr "Uveďte len jeden PDF sĆŗbor."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:21
+msgid ""
+"%prog [options] mybook.rtf\n"
+"\n"
+"\n"
+"%prog converts mybook.rtf to mybook.lrf"
+msgstr ""
+"Použitie: %prog [možnosti] kniha.rtf\n"
+"\n"
+"\n"
+"%prog prevedie kniha.rtf do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:146
+msgid ""
+"This RTF file has a feature calibre does not support. Convert it to HTML and "
+"then convert it."
+msgstr ""
+"Tento RTF sĆŗbor obsahuje prvky, ktorĆ© calibre nepodporuje. Preveďte ho "
+"najprv na HTML."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:19
+msgid ""
+"%prog [options] mybook.txt\n"
+"\n"
+"\n"
+"%prog converts mybook.txt to mybook.lrf"
+msgstr ""
+"Použitie: %prog [možnosti] kniha.txt\n"
+"\n"
+"\n"
+"%prog prevedie kniha.txt do kniha.lrf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:42
+msgid "Set the authors"
+msgstr "MenĆ” autorov"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:46
+msgid "Set the comment"
+msgstr "PoznƔmka"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:273
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
+msgid "Title"
+msgstr "NƔzov"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
+msgid "Author(s)"
+msgstr "Autor(i)"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:276
+msgid "Producer"
+msgstr "Producent"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:504
+msgid "Category"
+msgstr "KategĆ³ria"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:71
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:64
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
+msgid "Comments"
+msgstr "PoznƔmky"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+msgid "Tags"
+msgstr "Tagy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+msgid "Series"
+msgstr "SĆ©ria"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:282
+msgid "Language"
+msgstr "Jazyk"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
+msgid "A comma separated list of tags to set"
+msgstr "Čiarkami oddelenĆ½ zoznam tagov"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
+msgid "The series to which this book belongs"
+msgstr "SƩria, do ktorej tƔto kniha patrƭ"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
+msgid "The series index"
+msgstr "Poradie knihy v sƩrii"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
+msgid "The book language"
+msgstr "Jazyk knihy"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
+msgid "Extract the cover"
+msgstr "ExtrahovaÅ„ obĆ”lku"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/fb2.py:54
+msgid "Usage:"
+msgstr "Použitie:"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:53
+msgid "Usage: imp-meta file.imp"
+msgstr "Použitie: imp-meta sĆŗbor.imp"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/imp.py:54
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:60
+msgid "No filename specified."
+msgstr "Nebol uvedenĆ½ žiaden nĆ”zov sĆŗboru."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:97
+msgid ""
+"\n"
+"%prog [options] key\n"
+"\n"
+"Fetch metadata for books from isndb.com. You can specify either the \n"
+"books ISBN ID or its title and author. If you specify the title and author,\n"
+"then more than one book may be returned.\n"
+"\n"
+"key is the account key you generate after signing up for a free account from "
+"isbndb.com.\n"
+"\n"
+msgstr ""
+"\n"
+"%prog [možnosti] kľĆŗč\n"
+"\n"
+"PrevziaÅ„ metadĆ”ta knĆ­h z isndb.com. MĆ“Å¾ete zadaÅ„ buď kĆ³d ISBN, \n"
+"alebo nƔzov a autora knihy. Ak zadƔte nƔzov a autora knihy,\n"
+"mĆ“Å¾u byÅ„ serverom vrĆ”tenĆ© metadĆ”ta viacerĆ½ch knĆ­h.\n"
+"\n"
+"\"kľĆŗč\" je kľĆŗč k vĆ”Å”mu Ćŗčtu, ktorĆ½ zĆ­skate bezplatne po registrĆ”cii na "
+"isbndb.com.\n"
+"\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:108
+msgid "The ISBN ID of the book you want metadata for."
+msgstr "ISBN kĆ³d knihy, pre ktorĆŗ si želĆ”te zĆ­skaÅ„ metadĆ”ta."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:110
+msgid "The author whose book to search for."
+msgstr "Autor hľadanej knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:112
+msgid "The title of the book to search for."
+msgstr "NĆ”zov hľadanej knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/isbndb.py:114
+msgid "The publisher of the book to search for."
+msgstr "Vydavateľ hľadanej knihy."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:47
+msgid ""
+"Could not fetch cover as server is experiencing high load. Please try again "
+"later."
+msgstr ""
+"Nepodarilo sa prevziaÅ„ obĆ”lku, lebo server je preÅ„aženĆ½. ProsĆ­m skĆŗste "
+"operĆ”ciu zopakovaÅ„ neskĆ“r."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:48
+msgid " not found."
+msgstr " sa nepodarilo nĆ”jsÅ„."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:82
+msgid "LibraryThing.com server error. Try again later."
+msgstr ""
+"Chyba servera LibraryThing.com. ProsĆ­m skĆŗste operĆ”ciu zopakovaÅ„ neskĆ“r."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/library_thing.py:60
+msgid ""
+"\n"
+"%prog [options] ISBN\n"
+"\n"
+"Fetch a cover image for the book identified by ISBN from LibraryThing.com\n"
+msgstr ""
+"\n"
+"%prog  [možnosti] ISBN\n"
+"\n"
+"PrevziaÅ„ obĆ”lku knihy identifikovanej uvedenĆ½m kĆ³dom ISBN z "
+"LibraryThing.com\n"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:40
+msgid "Usage: %s file.lit"
+msgstr "Použitie: %s sĆŗbor.lit"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/lit.py:50
+msgid "Cover saved to"
+msgstr "ObĆ”lka uloženĆ” do"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
+msgid "Set the dc:language field"
+msgstr "Hodnota položky dc:language"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:58
+msgid "Usage: pdf-meta file.pdf"
+msgstr "Použitie: pdf-meta sĆŗbor.pdf"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/rb.py:59
+msgid "Usage: rb-meta file.rb"
+msgstr "Použitie: rb-meta sĆŗbor.rb"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
+msgid "%prog [options] myebook.mobi"
+msgstr "%prog  [možnosti]  kniha.mobi"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
+msgid "Raw MOBI HTML saved in"
+msgstr "NeupravenĆ© MOBI HTML uloženĆ© do"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:57
+msgid "The output directory. Defaults to the current directory."
+msgstr "VĆ½stupnĆ½ adresĆ”r. Å tandardne aktuĆ”lny pracovnĆ½ adresĆ”r."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
+msgid "Frequently used directories"
+msgstr "Často pouÅ¾Ć­vanĆ© adresĆ”re"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:27
+msgid "Send file to storage card instead of main memory by default"
+msgstr "UkladaÅ„ sĆŗbory na pamĆ¤Å„ovĆŗ kartu, nie do hlavnej pamƤte zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:29
+msgid "The format to use when saving single files to disk"
+msgstr ""
+"FormĆ”t, ktorĆ½ mĆ” byÅ„ použitĆ½ pri ukladanĆ­ jednotlivĆ½ch sĆŗborov na disk"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:31
+msgid "Confirm before deleting"
+msgstr "VyžadovaÅ„ potvrdenie pred zmazanĆ­m"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:33
+msgid "Toolbar icon size"
+msgstr "VeľkosÅ„ ikon panelu nĆ”strojov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:35
+msgid "Show button labels in the toolbar"
+msgstr "ZobrazovaÅ„ nadpisy tlačidiel panelu nĆ”strojov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:37
+msgid "Main window geometry"
+msgstr "Usporiadanie hlavnƩho okna"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:39
+msgid "Notify when a new version is available"
+msgstr "UpozorniÅ„ ak je k dispozĆ­cii novĆ” verzia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:41
+msgid "Use Roman numerals for series number"
+msgstr "Čƭslovanie knĆ­h v sĆ©rii RĆ­mskymi čƭslicami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:43
+msgid "Sort tags list by popularity"
+msgstr "Triediń zoznam tagov podľa popularity"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:45
+msgid "Number of covers to show in the cover browsing mode"
+msgstr "Počet obĆ”lok, ktorĆ© sa majĆŗ zobraziÅ„ v režime prezerania obĆ”lok"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:47
+msgid "Defaults for conversion to LRF"
+msgstr "Å tandardnĆ© nastavenie prevodu do formĆ”tu LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:49
+msgid "Options for the LRF ebook viewer"
+msgstr "Možnosti prehliadača elektronickĆ½ch knĆ­h vo formĆ”te LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:51
+msgid "Formats that are viewed using the internal viewer"
+msgstr "FormĆ”ty zobrazenĆ© internĆ½m prehliadačom"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:53
+msgid "Columns to be displayed in the book list"
+msgstr "Počet stÄŗpcov v zozname knĆ­h"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:54
+msgid "Automatically launch content server on application startup"
+msgstr "Automaticky spĆŗŔńaÅ„ obsahovĆ½ server pri Å”tarte aplikĆ”cie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:55
+msgid "Oldest news kept in database"
+msgstr "NajstarÅ”ie sprĆ”vy ponechanĆ© v databĆ”ze"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr "ZobraziÅ„ ikonu v systĆ©movej liÅ”te"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr "OdoslaÅ„ prevzatĆ© sprĆ”vy do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr "ZmazaÅ„ knihy z knižnice po ich odoslanĆ­ do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
+msgid "Device no longer connected."
+msgstr "Zariadenie už nie je pripojenĆ©."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:117
+msgid "Get device information"
+msgstr "ZĆ­skaÅ„ informĆ”cie o zariadenĆ­"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:128
+msgid "Get list of books on device"
+msgstr "PrevziaÅ„ zoznam knĆ­h v zariadenĆ­"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:137
+msgid "Send metadata to device"
+msgstr "OdoslaÅ„ metadĆ”ta do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:144
+msgid "Upload %d books to device"
+msgstr "OdoslaÅ„ %d knĆ­h do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:159
+msgid "Delete books from device"
+msgstr "Zmazań knihy zo zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:174
+msgid "Download books from device"
+msgstr "Prevziań knihy zo zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/device.py:184
+msgid "View book on device"
+msgstr "ZobraziÅ„ knihu v zariadenĆ­"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+msgid "Path"
+msgstr "Cesta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+msgid "Formats"
+msgstr "FormƔty"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:88
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:52
+msgid "Dialog"
+msgstr "Dialog"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
+msgid "TextLabel"
+msgstr "TextLabel"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:65
+msgid "&Previous"
+msgstr "&SpĆ¤Å„"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:66
+msgid "&Next"
+msgstr "&Ďalej"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:40
+msgid "Choose Format"
+msgstr "Vyberte formƔt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:34
+msgid "Set defaults for conversion of comics (CBR/CBZ files)"
+msgstr "Å tandardnĆ© nastavenia prevodu komiksov (CBR/CBZ sĆŗborov)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:49
+msgid "Set options for converting %s"
+msgstr "Možnosti prevodu %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:89
+msgid "&Title:"
+msgstr "&NƔzov:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:90
+msgid "&Author(s):"
+msgstr "&Autor(i):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:91
+msgid "&Number of Colors:"
+msgstr "Počet &farieb:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:398
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:548
+msgid "&Profile:"
+msgstr "&Profil:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:93
+msgid "Disable &normalize"
+msgstr "VypnĆŗÅ„ &normalizĆ”ciu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:94
+msgid "Keep &aspect ratio"
+msgstr "ZachovaÅ„ &pomer strĆ”n"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:95
+msgid "Disable &Sharpening"
+msgstr "VypnĆŗÅ„ &zaostrovanie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:96
+msgid "&Landscape"
+msgstr "Na Å”Ć­&rku"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:97
+msgid "Don't so&rt"
+msgstr "&Netriediń"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:98
+msgid "&Right to left"
+msgstr "&Sprava doľava"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:99
+msgid "De&speckle"
+msgstr "Čistiaci &filter"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf_ui.py:100
+msgid "&Wide"
+msgstr "Å iro&kĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Advanced"
+msgstr "RozÅ”Ć­renĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr "VÅ”eobecnĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr "Rozhranie"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid ""
+"Content\n"
+"Server"
+msgstr ""
+"ObsahovĆ½\n"
+"Server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
+msgid "Error log:"
+msgstr "ZƔznam o chybƔch:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
+msgid "Access log:"
+msgstr "ZƔznam o prƭstupe:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
+msgid "Failed to start content server"
+msgstr "Nepodarilo sa spustiÅ„ obsahovĆ½ server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr "NeplatnĆ” veľkosÅ„"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr "VeľkosÅ„ %s je neplatnĆ”. PožadovanĆ½ formĆ”t je Å”Ć­rka x vĆ½Å”ka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
+msgid "Invalid database location"
+msgstr "NeplatnƩ umiestnenie databƔzy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
+msgid "<br>Must be a directory."
+msgstr "<br>MusĆ­ byÅ„ adresĆ”r."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
+msgid "Invalid database location "
+msgstr "NeplatnƩ umiestnenie databƔzy "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
+msgid "Invalid database location.<br>Cannot write to "
+msgstr "NeplatnĆ© umiestnenie databĆ”zy.<br>NemĆ“Å¾em zapisovaÅ„ do "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
+msgid "Compacting database. This may take a while."
+msgstr "ZmenÅ”ujem databĆ”zu. Tento proces mĆ“Å¾e chvĆ­Ä¾u trvaÅ„."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
+msgid "Compacting..."
+msgstr "ZmenŔujem..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
+msgid "Configuration"
+msgstr "Nastavenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
+msgid ""
+"&Location of ebooks (The ebooks are stored in folders sorted by author and "
+"metadata is stored in the file metadata.db)"
+msgstr ""
+"&Umiestnenie elektronickĆ½ch knĆ­h (Knihy sĆŗ umiestnenĆ© v adresĆ”roch podľa "
+"autora a metadĆ”ta sĆŗ uloženĆ© v sĆŗbore metadata.db)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
+msgid "Browse for the new database location"
+msgstr "Určte novĆ© umiestnenie databĆ”zy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:312
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:314
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:318
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:320
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
+msgid "..."
+msgstr "..."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
+msgid "Show notification when &new version is available"
+msgstr "ZobraziÅ„ upozornenie keď je k dispozĆ­cii &novĆ” verzia."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
+msgid ""
+"If you disable this setting, metadata is guessed from the filename instead. "
+"This can be configured in the Advanced section."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
+msgid "Read &metadata from files"
+msgstr "ČƭtaÅ„ &metadĆ”ta zo sĆŗborov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
+msgid "Format for &single file save:"
+msgstr "FormĆ”t pre uloženie do jednĆ©ho &sĆŗboru:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
+msgid "Default network &timeout:"
+msgstr "Å tandardnĆ½ časovĆ½ &limit siete:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
+msgid ""
+"Set the default timeout for network fetches (i.e. anytime we go out to the "
+"internet to get information)"
+msgstr ""
+"Å tandardnĆ½ časovĆ½ limit pre sieÅ„ovĆ© dopyty (pri preberanĆ­ informĆ”ciĆ­ z "
+"internetu)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
+msgid " seconds"
+msgstr " sekĆŗnd"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
+msgid "Choose &language (requires restart):"
+msgstr "Vyberte &jazyk (vyžaduje reŔtart):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
+msgstr "NormƔlny"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
+msgstr "VysokĆ”"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
+msgstr "NĆ­zka"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
+msgstr "&Priorita Ćŗloh:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
+msgid "Add a directory to the frequently used directories list"
+msgstr "PridaÅ„ adresĆ”r do zoznamu často pouÅ¾Ć­vanĆ½ch"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
+msgid "Remove a directory from the frequently used directories list"
+msgstr "OdobraÅ„ adresĆ”r zo zoznamu často pouÅ¾Ć­vanĆ½ch"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
+msgid "Use &Roman numerals for series number"
+msgstr "ČƭslovaÅ„ knihy v sĆ©rii &RĆ­mskymi čƭslicami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
+msgid "&Number of covers to show in browse mode (after restart):"
+msgstr ""
+"Počet &obĆ”lok zobrazenĆ½ch v režime prehliadania obĆ”lok (vyžaduje reÅ”tart):"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
+msgid "Toolbar"
+msgstr "Panel nƔstrojov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
+msgid "Large"
+msgstr "VeľkĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
+msgid "Medium"
+msgstr "StrednƩ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
+msgid "Small"
+msgstr "MalƩ"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
+msgid "&Button size in toolbar"
+msgstr "&VeľkosÅ„ tlačidiel na paneli nĆ”strojov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
+msgid "Show &text in toolbar buttons"
+msgstr "ZobraziÅ„ &text na tlačidlĆ”ch panelu nĆ”strojov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
+msgid "Select visible &columns in library view"
+msgstr "ViditeľnĆ© &stÄŗpce v zozname knĆ­h v knižnici"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
+msgid "Use internal &viewer for the following formats:"
+msgstr "PoužiÅ„ internĆ½ &prehliadač na tieto formĆ”ty:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr "ZobraziÅ„ &ikonu v systĆ©movej liÅ”te"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr "&Automaticky odosielaÅ„ prevzatĆ© sprĆ”vy do čƭtacieho zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr "&ZmazaÅ„ sprĆ”vy z knižnice po ich odoslanĆ­ do zariadenia"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
+msgid "Free unused diskspace from the database"
+msgstr "UvoľniÅ„ nepoužitĆ½ diskovĆ½ priestor v databĆ”ze"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
+msgid "&Compact database"
+msgstr "ZmenÅ”iÅ„ &databĆ”zu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
+msgid "&Metadata from file name"
+msgstr "&MetadĆ”ta zo sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
+msgid ""
+"calibre contains a network server that allows you to access your book "
+"collection using a browser from anywhere in the world. Any changes to the "
+"settings will only take effect after a server restart."
+msgstr ""
+"calibre obsahuje sieÅ„ovĆ½ server, ktorĆ½ vĆ”m umožnĆ­ prĆ­stup k vaÅ”im knihĆ”m "
+"pomocou internetovĆ©ho prehliadača, z akĆ©hokoľvek miesta na svete. Zmeny v "
+"nastaveniach sa prejavia až po reŔtarte servera."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
+msgid "Server &port:"
+msgstr "&Port servera:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+msgid "&Username:"
+msgstr "Po&uÅ¾Ć­vateľskĆ© meno:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
+msgid "&Password:"
+msgstr "&Heslo:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
+msgid ""
+"If you leave the password blank, anyone will be able to access your book "
+"collection using the web interface."
+msgstr ""
+"Ak ponechĆ”te heslo prĆ”zdne, ktokoľvek bude maÅ„ prĆ­stup k vaÅ”ej zbierke knĆ­h "
+"cez toto webovƩ rozhranie."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
+msgid "&Show password"
+msgstr "&Zobraziń heslo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+"MaximĆ”lna veľkosÅ„ (Å”Ć­rka x vĆ½Å”ka) zobrazenĆ½ch obĆ”lok. VeľkĆ© obĆ”lky budĆŗ "
+"zmenÅ”enĆ©. "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr "Max. veľkosÅ„ &obĆ”lok:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
+msgid "&Start Server"
+msgstr "&Spustiń server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
+msgid "St&op Server"
+msgstr "&Zastaviń server"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
+msgid "&Test Server"
+msgstr "&Test servera"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
+msgid "Run server &automatically on startup"
+msgstr "&Automaticky spustiń server pri Ŕtarte"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
+msgid "View &server logs"
+msgstr "Z&obraziÅ„ serverovĆ© zĆ”znamy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
+msgid ""
+"If you want to use the content server to access your ebook collection on "
+"your iphone with Stanza, you will need to add the URL "
+"http://myhostname:8080/stanza as a new catalog in the stanza reader on your "
+"iphone. Here myhostname should be the fully qualified hostname or the IP "
+"address of this computer."
+msgstr ""
+"Ak chcete pristupovaÅ„ k vaÅ”im knihĆ”m prostrednĆ­ctvom obsahovĆ©ho servera a "
+"telefĆ³nu iPhone s programom Stanza, zadajte URL "
+"http://mojehostname:8080/stanza ako novĆ½ katalĆ³g do čƭtacieho programu "
+"Stanza na vaÅ”om iPhone, pričom \"mojehostname\" musĆ­ byÅ„ ĆŗplnĆ” symbolickĆ” "
+"alebo IP adresa vĆ”Å”ho počƭtača."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
+msgid "ERROR"
+msgstr "CHYBA"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:50
+msgid "Bulk convert to EPUB"
+msgstr "DĆ”vkovĆ½ prevod do formĆ”tu EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:52
+msgid "Convert %s to EPUB"
+msgstr "PreviesÅ„ %s do formĆ”tu EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:84
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+msgid "Metadata"
+msgstr "MetadƔta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:85
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:57
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+msgid "Look & Feel"
+msgstr "Vzhľad"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid "Page Setup"
+msgstr "Nastavenia strany"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid "Chapter Detection"
+msgstr "AutomatickƩ rozoznƔvanie kapitol"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:84
+msgid ""
+"Specify metadata such as title and author for the book.\n"
+"\n"
+"Metadata will be updated in the database as well as the generated EPUB file."
+msgstr ""
+"MetadƔta knihy, ako napr. nƔzov alebo meno autora.\n"
+"\n"
+"MetadĆ”ta budĆŗ zaznamenanĆ© do databĆ”zy, spolu s vĆ½slednĆ½m EPUB sĆŗborom."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:85
+msgid ""
+"Adjust the look of the generated EPUB file by specifying things like font "
+"sizes."
+msgstr "VzhľadovĆ© vlastnosti vĆ½slednej EPUB knihy, ako napr. veľkosÅ„ pĆ­sma."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:86
+msgid "Specify the page layout settings like margins."
+msgstr "Parametre rozloženia strany, ako napr. okraje."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:299
+msgid "Fine tune the detection of chapter and section headings."
+msgstr "RozÅ”Ć­renĆ© nastavenia automatickĆ©ho rozoznĆ”vania kapitol a sekciĆ­."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:167
+msgid "Choose cover for "
+msgstr "Vyberte obƔlku pre "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+msgid "Cannot read"
+msgstr "NemĆ“Å¾em čƭtaÅ„"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
+msgid "You do not have permission to read the file: "
+msgstr "NemĆ”te prĆ­stupovĆ© prĆ”va na čƭtanie sĆŗboru: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+msgid "Error reading file"
+msgstr "Chyba pri čƭtanĆ­ sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
+msgid "<p>There was an error reading from file: <br /><b>"
+msgstr "<p>Chyba pri čƭtanĆ­ sĆŗboru: <br /><b>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:190
+msgid " is not a valid picture"
+msgstr " nie je platnĆ½ obrazovĆ½ sĆŗbor"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
+msgid "Cannot convert"
+msgstr "NemĆ“Å¾em previesÅ„"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:228
+msgid "This book has no available formats"
+msgstr "TĆ”to kniha nie je k dispozĆ­cii v žiadnom formĆ”te"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:233
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:93
+msgid "No available formats"
+msgstr "Žiadny formĆ”t nie je k dispozĆ­cii"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:94
+msgid "Cannot convert %s as this book has no supported formats"
+msgstr ""
+"NemĆ“Å¾em previesÅ„ %s, lebo nie je k dispozĆ­cii v žiadnom z podporovanĆ½ch "
+"formƔtov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:238
+msgid "Choose the format to convert to EPUB"
+msgstr "ZdrojovĆ½ formĆ”t prevodu do EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:249
+msgid "Invalid XPath expression"
+msgstr "NeplatnĆ½ vĆ½raz XPath"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:250
+msgid "The expression %s is invalid. Error: %s"
+msgstr "VĆ½raz %s je neplatnĆ½. Chyba: %s"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:369
+msgid "Convert to EPUB"
+msgstr "Prevod do formƔtu EPUB"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:506
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:315
+msgid "Book Cover"
+msgstr "ObƔlka knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
+msgid "Change &cover image:"
+msgstr "ZmeniÅ„ &obĆ”lku:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
+msgid "Browse for an image to use as the cover of this book."
+msgstr "Vyberte obrazovĆ½ sĆŗbor, ktorĆ½ sa mĆ” použiÅ„ ako obĆ”lka tejto knihy."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "PoužiÅ„ obĆ”lku zo &zdrojovĆ©ho sĆŗboru"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
+msgid "&Title: "
+msgstr "&NƔzov: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:512
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:280
+msgid "Change the title of this book"
+msgstr "NƔzov knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
+msgid "&Author(s): "
+msgstr "&Autor(i): "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by "
+"an &. If the author name contains an &, use && to represent it."
+msgstr ""
+"Autor(i) tejto knihy. ViacerĆ­ autori by mali byÅ„ oddelenĆ­ znakom & "
+"(ampersand). Ak meno autora obsahuje znak &, zadajte ho ako &&."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:515
+msgid "Author So&rt:"
+msgstr "Autor v tvare \"&priezvisko, meno\":"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:516
+msgid ""
+"Change the author(s) of this book. Multiple authors should be separated by a "
+"comma"
+msgstr "Autor(i) tejto knihy. ViacerĆ­ autori by mali byÅ„ oddelenĆ­ čiarkami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
+msgid "&Publisher: "
+msgstr "&Vydavateľ: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
+msgid "Change the publisher of this book"
+msgstr "Vydavateľ tejto knihy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:519
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:295
+msgid "Ta&gs: "
+msgstr "Ta&gy: "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
+msgid ""
+"Tags categorize the book. This is particularly useful while searching. "
+"<br><br>They can be any words or phrases, separated by commas."
+msgstr ""
+"Tagy radia knihu do kategĆ³riĆ­. UžitočnĆ© sĆŗ najmƤ pri "
+"vyhľadĆ”vanĆ­.<br><br>MĆ“Å¾u to byÅ„ ľubovoľnĆ© slovĆ” alebo frĆ”zy, oddelenĆ© "
+"čiarkami."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
+msgid "&Series:"
+msgstr "&SĆ©ria:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
+msgid "List of known series. You can add new series."
+msgstr "Zoznam znĆ”mych sĆ©riĆ­. MĆ“Å¾ete zadaÅ„ novĆŗ sĆ©riu."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:389
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:524
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:525
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:305
+msgid "Series index."
+msgstr "Poradie v sƩrii."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:390
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:306
+msgid "Book "
+msgstr "Kniha "
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:392
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:534
+msgid "Source en&coding:"
+msgstr "ZdrojovĆ© &kĆ³dovanie jazyka:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:393
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:528
+msgid "Base &font size:"
+msgstr "ZĆ”kladnĆ” &veľkosÅ„ pĆ­sma:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:394
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:400
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:402
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:404
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:406
+msgid " pt"
+msgstr " bodov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:395
+msgid "Remove &spacing between paragraphs"
+msgstr "OdstrĆ”niÅ„ &medzery medzi odstavcami"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:396
+msgid "Preserve &tag structure when splitting"
+msgstr "Pri rozdeľovanĆ­ zachovaÅ„ Å”truktĆŗru &tagov"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:397
+msgid "Override &CSS"
+msgstr "Nahradiń &CSS"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:399
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:549
+msgid "&Left Margin:"
+msgstr "Ľa&vĆ½ okraj:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:401
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:551
+msgid "&Right Margin:"
+msgstr "&PravĆ½ okraj:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:403
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:553
+msgid "&Top Margin:"
+msgstr "&HornĆ½ okraj:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:405
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:555
+msgid "&Bottom Margin:"
+msgstr "&DolnĆ½ okraj:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:407
+msgid "Automatic &chapter detection"
+msgstr "AutomatickƩ rozoznƔvanie &kapitol"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:408
+msgid "&XPath:"
+msgstr "VĆ½raz &XPath:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:409
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">You can control how "
+"calibre detects chapters using a XPath expression. To learn how to use XPath "
+"expressions see the <a "
+"href=\"https://calibre.kovidgoyal.net/user_manual/xpath.html\"><span "
+"style=\" text-decoration: underline; color:#0000ff;\">XPath "
+"tutorial</span></a></p></body></html>"
+msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">AutomatickƩ rozoznƔvanie "
+"kapitol mĆ“Å¾ete ovlĆ”daÅ„ pomocou vĆ½razu XPath. Viac informĆ”ciĆ­ o vĆ½razoch "
+"XPath nƔjdete v <a "
+"href=\"https://calibre.kovidgoyal.net/user_manual/xpath.html\"><span "
+"style=\" text-decoration: underline; color:#0000ff;\">XPath "
+"tutoriƔli.</span></a></p></body></html>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:414
+msgid "Chapter &mark:"
+msgstr "&Značka kapitol:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:415
+msgid "Automatic &Table of Contents"
+msgstr "AutomatickĆ½ &obsah"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:416
+msgid "Number of &links to add to Table of Contents"
+msgstr "&Počet odkazov, ktorĆ© budĆŗ pridanĆ© do obsahu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:417
+msgid "Do not add &detected chapters to the Table of Contents"
+msgstr "&NepridĆ”vaÅ„ automaticky rozoznanĆ© kapitoly do obsahu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:418
+msgid "Chapter &threshold"
+msgstr "PrahovĆ” Ćŗroveň &kapitol"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:419
+msgid "&Force use of auto-generated Table of Contents"
+msgstr "&Vždy použiÅ„ automaticky generovanĆ½ obsah"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:420
+msgid "Level &1 TOC"
+msgstr "Obsah Ćŗrovne &1"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:421
+msgid "Level &2 TOC"
+msgstr "Obsah Ćŗrovne &2"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:38
+msgid "Author Sort"
+msgstr "Autor (triediń ako)"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:40
+msgid "ISBN"
+msgstr "ISBN"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:104
+msgid "Cannot connect"
+msgstr "Spojenie zlyhalo"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:105
+msgid "You must specify a valid access key for isbndb.com"
+msgstr "MusĆ­te zadaÅ„ platnĆ½ kľĆŗč pre isbndb.com"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:139
+msgid "Error fetching metadata"
+msgstr "Chyba preberania metadƔt"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+msgid "No metadata found"
+msgstr "Žiadne metadĆ”ta neboli nĆ”jdenĆ©"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:144
+msgid ""
+"No metadata found, try adjusting the title and author or the ISBN key."
+msgstr ""
+"Žiadne metadĆ”ta neboli nĆ”jdenĆ©, skĆŗste pozmeniÅ„ titul a autora, alebo ISBN "
+"kĆ³d."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:77
+msgid "Fetch metadata"
+msgstr "PrevziaÅ„ metadĆ”ta"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:78
+msgid "Fetching metadata for <b>%1</b>"
+msgstr "PreberƔm metadƔta pre <b>%1</b>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:79
+msgid ""
+"Sign up for a free account from <a "
+"href=\"http://www.isbndb.com\">ISBNdb.com</a> to get an access key."
+msgstr ""
+"Založte si bezplatnĆ½ Ćŗčet na <a "
+"href=\"http://www.isbndb.com\">ISBNdb.com</a> a zĆ­skate prĆ­stupovĆ½ kľĆŗč."
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:80
+msgid "&Access Key:"
+msgstr "&PrĆ­stupovĆ½ kľĆŗč:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:81
+msgid "Fetch"
+msgstr "Prevziań"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:82
+msgid "Matches"
+msgstr "Zhody"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata_ui.py:83
+msgid ""
+"Select the book that most closely matches your copy from the list below"
+msgstr "Zo zoznamu dole vyberte knihu, ktorĆ” sa najviac zhoduje s vaÅ”ou"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/job_view_ui.py:33
+msgid "Details of job"
+msgstr "Podrobnosti Ćŗlohy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:27
+msgid "Unavailable"
+msgstr "Nie sĆŗ k dispozĆ­cii"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs.py:38
+msgid " - Jobs"
+msgstr " - ƚlohy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:38
+msgid "Active Jobs"
+msgstr "AktĆ­vne Ćŗlohy"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/jobs_ui.py:39
+msgid "&Stop selected job"
+msgstr "&ZastaviÅ„ označenĆŗ Ćŗlohu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:98
+msgid "Choose the format to convert into LRF"
+msgstr "Vyberte zdrojovĆ½ formĆ”t na prevod do LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:106
+msgid "Convert %s to LRF"
+msgstr "PreviesÅ„ %s do formĆ”tu LRF"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:109
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:347
+msgid "Set conversion defaults"
+msgstr "Å tandardnĆ© nastavenie prevodu"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:260
+msgid ""
+"Preprocess the file before converting to LRF. This is useful if you know "
+"that the file is from a specific source. Known sources:"
+msgstr ""
+"PredspracovaÅ„ sĆŗbor pred prevodom do LRF. UžitočnĆ© ak poznĆ”te zdroj z "
+"ktorĆ©ho sĆŗbor pochĆ”dza. ZnĆ”me zdroje:"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:261
+msgid "<ol><li><b>baen</b> - Books from BAEN Publishers</li>"
+msgstr "<ol><li><b>baen</b> - Knihy z vydavateľstva BAEN</li>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:262
+msgid ""
+"<li><b>pdftohtml</b> - HTML files that are the output of the program "
+"pdftohtml</li>"
+msgstr ""
+"<li><b>pdftohtml</b> - HTML sĆŗbory vygenerovanĆ© programom pdftohtml</li>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:263
+msgid "<li><b>book-designer</b> - HTML0 files from Book Designer</li>"
+msgstr ""
+"<li><b>book-designer</b> - sĆŗbory HTML0 z programu Book Designer</li>"
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
+msgid ""
+"Specify metadata such as title and author for the book.<p>Metadata will be "
+"updated in the database as well as the generated LRF file."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:297
+msgid ""
+"Adjust the look of the generated LRF file by specifying things like font "
+"sizes and the spacing between words."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:298
+msgid ""
+"Specify the page settings like margins and the screen size of the target "
+"device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:308
+msgid "<font color=\"gray\">No help available</font>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:411
+msgid "Bulk convert ebooks to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:503
+msgid "Convert to LRF"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:505
+msgid "Options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:536
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:538
+msgid " pts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:530
+msgid "Embedded Fonts"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:531
+msgid "&Serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:532
+msgid "S&ans-serif:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:533
+msgid "&Monospace:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:535
+msgid "Minimum &indent:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:537
+msgid "&Word spacing:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:539
+msgid "Enable auto &rotation of images"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:540
+msgid "Insert &blank lines between paragraphs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:541
+msgid "Ignore &tables"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:542
+msgid "Ignore &colors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:543
+msgid "&Preprocess:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:544
+msgid "Header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:545
+msgid "&Show header"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:546
+msgid "&Header format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:547
+msgid "Override<br>CSS"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:550
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:552
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:554
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:107
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:109
+msgid " px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:557
+msgid "&Convert tables to images (good for large/complex tables)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:558
+msgid "&Multiplier for text size in rendered tables:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:559
+msgid "Title based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:560
+msgid "&Disable chapter detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:561
+msgid "&Regular expression:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:562
+msgid "Add &chapters to table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:563
+msgid "Don't add &links to the table of contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:564
+msgid "Tag based detection"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:565
+msgid "&Page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:566
+msgid "&Force page break before tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:567
+msgid "Force page break before &attribute:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:568
+msgid "Detect chapter &at tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:569
+msgid "Help on item"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:570
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+msgid "Edit Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
+msgid "Meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
+msgid "Author S&ort: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
+msgid ""
+"Specify how the author(s) of this book should be sorted. For example Charles "
+"Dickens should be sorted as Dickens, Charles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
+msgid "&Rating:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
+msgid "Rating of this book. 0-5 stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
+msgid " stars"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+msgid "Add Ta&gs: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
+msgid "Open Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+msgid "&Remove tags:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+msgid "Comma separated list of tags to remove from the books. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
+msgid "Remove &format:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
+msgid ""
+"<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
+"do not have one, you can <a href='http://www.librarything.com'>register</a> "
+"for free!.</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
+msgid "<b>Could not fetch cover.</b><br/>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
+msgid "Could not fetch cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
+msgid "Cannot fetch cover"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
+msgid "You must specify the ISBN identifier for this book."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:277
+msgid "Edit Meta Information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:281
+msgid "Swap the author and title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:287
+msgid ""
+"Automatically create the author sort entry based on the current author entry"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:302
+msgid "Remove unused series (Series that have no books)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:307
+msgid "IS&BN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:309
+msgid "Fetch metadata from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:310
+msgid "Available Formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:311
+msgid "Add a new format for this book to the database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:313
+msgid "Remove the selected formats for this book from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:319
+msgid "Reset cover to default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:321
+msgid "Fetch cover image from server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:322
+msgid ""
+"Change the username and/or password for your account at LibraryThing.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:323
+msgid "Change password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:55
+msgid "Password needed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
+msgid "Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
+msgid "Must set account information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
+msgid "This recipe requires a username and password"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
+msgid "Last downloaded: %s days ago"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
+msgid "Last downloaded: never"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+msgid "Schedule news download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
+msgid "Add a custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
+msgid "News"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
+msgid "Recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+msgid "Schedule for download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+msgid "title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+msgid "description"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+msgid "&Schedule for download every:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+msgid ""
+"Interval at which to download this recipe. A value of zero means that the "
+"recipe will be downloaded every hour."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
+msgid " days"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+msgid "&Account"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
+msgid "For the scheduling to work, you must leave calibre running."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
+msgid "&Download now"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
+msgid ""
+"Delete downloaded news older than the specified number of days. Set to zero "
+"to disable."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
+msgid "Delete downloaded news older than "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:35
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:96
+msgid "Form"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:36
+msgid "contains"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:37
+msgid "The text to search for. It is interpreted as a regular expression."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:38
+msgid ""
+"<p>Negate this match. That is, only return results that <b>do not</b> match "
+"this query."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_item_ui.py:39
+msgid "Negate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:87
+msgid "Advanced Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:88
+msgid "Find entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:89
+msgid "&All these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:90
+msgid "This exact &phrase:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:91
+msgid "&One or more of these words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:92
+msgid "But dont show entries that have..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:93
+msgid "Any of these &unwanted words:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/search_ui.py:94
+msgid ""
+"See the <a href=\"http://calibre.kovidgoyal.net/user_manual/gui.html#the-"
+"search-interface\">User Manual</a> for more help"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:123
+msgid "Tag Editor"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:124
+msgid "A&vailable tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:125
+msgid ""
+"Delete tag from database. This will unapply the tag from all books and then "
+"remove it from the database."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:127
+msgid "Apply tag to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:129
+msgid "A&pplied tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:130
+msgid "Unapply (remove) tag from current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:132
+msgid "&Add tag:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:133
+msgid ""
+"If the tag you want is not in the available list, you can add it here. "
+"Accepts a comma separated list of tags."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/tag_editor_ui.py:134
+msgid "Add tag to available tags and apply it to current book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:63
+msgid "No recipe selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:69
+msgid "The attached file: %s is a recipe to download %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:70
+msgid "Recipe for "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:86
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:97
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:221
+msgid "Switch to Advanced mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:100
+msgid "Switch to Basic mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:110
+msgid "Feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:111
+msgid "The feed must have a title"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:115
+msgid "Feed must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:116
+msgid "The feed %s must have a URL"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:121
+msgid "Already exists"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:122
+msgid "This feed has already been added to the recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+msgid "Invalid input"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
+msgid "<p>Could not create recipe. Error:<br>%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+msgid "Replace recipe?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
+msgid "A custom recipe named %s already exists. Do you want to replace it?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:202
+msgid "Pick recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:202
+msgid "Pick the recipe to customize"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
+msgid "Choose a recipe file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:214
+msgid "Add custom news source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:215
+msgid "Available user recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:216
+msgid "Add/Update &recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:217
+msgid "&Remove recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:218
+msgid "&Share recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:219
+msgid "Customize &builtin recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:220
+msgid "&Load recipe from file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:222
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Create a basic news "
+"recipe, by adding RSS feeds to it. <br />For most feeds, you will have to "
+"use the \"Advanced mode\" to further customize the fetch "
+"process.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:226
+msgid "Recipe &title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:227
+msgid "&Oldest article:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:228
+msgid "The oldest article to download"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:230
+msgid "&Max. number of articles per feed:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:231
+msgid "Maximum number of articles to download per feed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:232
+msgid "Feeds in recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:234
+msgid "Remove feed from recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:237
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:240
+msgid "Add feed to recipe"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:238
+msgid "&Feed title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:239
+msgid "Feed &URL:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:241
+msgid "&Add feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:242
+msgid ""
+"For help with writing advanced news recipes, please visit <a "
+"href=\"http://calibre.kovidgoyal.net/user_manual/news.html\">User Recipes</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:243
+msgid "Recipe source code (python)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:97
+msgid ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
+"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
+"type=\"text/css\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
+"font-weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Set a regular expression "
+"pattern to use when trying to guess ebook metadata from filenames. </p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">A <a "
+"href=\"http://docs.python.org/lib/re-syntax.html\"><span style=\" text-"
+"decoration: underline; color:#0000ff;\">reference</span></a> on the syntax "
+"of regular expressions is available.</p>\n"
+"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Use the <span style=\" "
+"font-weight:600;\">Test</span> functionality below to test your regular "
+"expression on a few sample filenames. The group names for the various "
+"metadata entries are documented in tooltips.</p></body></html>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:104
+msgid "Regular &expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:105
+msgid "&Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:106
+msgid "File &name:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:107
+msgid "Test"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:108
+msgid "Title:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:109
+msgid "Regular expression (?P&lt;title&gt;)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:110
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:113
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:116
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:119
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:58
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:63
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:68
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:70
+msgid "No match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:111
+msgid "Authors:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:112
+msgid "Regular expression (?P<authors>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:114
+msgid "Series:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:115
+msgid "Regular expression (?P<series>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:117
+msgid "Series index:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:118
+msgid "Regular expression (?P<series_index>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:120
+msgid "ISBN:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/filename_pattern_ui.py:121
+msgid "Regular expression (?P<isbn>)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:46
+msgid "Job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:47
+msgid "Status"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:48
+msgid "Progress"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:49
+msgid "Running time"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:65
+msgid "Unknown job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:70
+msgid "Finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:72
+msgid "Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:74
+msgid "Waiting"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:76
+msgid "Working"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
+msgid "Cannot kill job"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
+msgid "Cannot kill jobs that communicate with the device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
+msgid "Job has already run"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
+msgid "Size (MB)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
+msgid "Date"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+msgid "Rating"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
+msgid "None"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+msgid "Book <font face=\"serif\">%s</font> of %s."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
+msgid "Format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
+msgid "Timestamp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
+msgid "Search (For Advanced Search click the button to the left)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:47
+msgid "Configure Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:48
+msgid "Use white background"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:49
+msgid "Hyphenate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/config_ui.py:50
+msgid "<b>Changes will only take effect after a restart.</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:64
+msgid " - LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
+msgid "No matches found"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:128
+msgid "LRF Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:129
+msgid "Parsing LRF file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:130
+msgid "LRF Viewer toolbar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:131
+msgid "Next Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:132
+msgid "Previous Page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+msgid "Back"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+msgid "Forward"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:135
+msgid "Next match"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
+msgid "Open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:137
+msgid "Configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
+msgid "Error communicating with device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+msgid "&Restore"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+msgid "&Donate"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
+msgid "&Quit"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
+msgid ""
+"<p>For help visit <a "
+"href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
+msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+msgid "Send to main memory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
+msgid "Send to storage card"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
+msgid "and delete from library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
+msgid "Send to storage card by default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+msgid "Edit metadata individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
+msgid "Edit metadata in bulk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
+msgid "Add books from a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
+msgid ""
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
+msgid ""
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
+msgid "Save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
+msgid "Save to disk in a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
+msgid "Save only %s format to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
+msgid "View"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
+msgid "View specific format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
+msgid "Convert individually"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
+msgid "Bulk convert"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
+msgid "Set defaults for conversion"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
+msgid "Set defaults for conversion of comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
+msgid "Bad database location"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
+msgid "Choose a location for your ebook library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
+msgid "Migrating database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
+msgid "Device: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
+msgid " detected."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
+msgid "Connected "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
+msgid "Device database corrupted"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
+msgid ""
+"\n"
+"                <p>The database of books on the reader is corrupted. Try the "
+"following:\n"
+"                <ol>\n"
+"                <li>Unplug the reader. Wait for it to finish regenerating "
+"the database (i.e. wait till it is ready to be used). Plug it back in. Now "
+"it should work with %(app)s. If not try the next step.</li>\n"
+"                <li>Quit %(app)s. Find the file media.xml in the reader's "
+"main memory. Delete it. Unplug the reader. Wait for it to regenerate the "
+"file. Re-connect it and start %(app)s.</li>\n"
+"                </ol>\n"
+"                "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
+msgid ""
+"<p>Books with the same title as the following already exist in the database. "
+"Add them anyway?<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
+msgid "Duplicates found!"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
+msgid "Uploading books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
+msgid "Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
+msgid "EPUB Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
+msgid "LRF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
+msgid "HTML Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
+msgid "LIT Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
+msgid "MOBI Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
+msgid "Text books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
+msgid "PDF Books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
+msgid "Comics"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
+msgid "Archives"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
+msgid "No space on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
+msgid ""
+"<p>Cannot upload books to device there is no more free space available "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
+msgid "Deleting books from device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+msgid "Cannot edit metadata"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
+msgid "No books selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
+msgid "Sending books to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
+msgid "No suitable formats"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
+msgid ""
+"Could not upload the following books to the device, as no suitable formats "
+"were found:<br><ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+msgid "Cannot save to disk"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
+msgid "Choose destination directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
+msgid ""
+"<p>Could not save the following books to disk, because the %s format is not "
+"available for them:<ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
+msgid "Could not save some ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
+msgid "Fetching news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
+msgid " fetched."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+msgid "No book selected"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
+msgid "Cannot view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
+msgid "Choose the format to view"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
+msgid "%s has no available formats."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
+msgid "Cannot configure"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
+msgid "Cannot configure while there are running jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
+msgid "Copying database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
+msgid "Copying library to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
+msgid "Invalid database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
+msgid ""
+"<p>An invalid database already exists at %s, delete it before trying to move "
+"the existing database.<br>Error: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
+msgid "Could not move database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
+msgid "No detailed info available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
+msgid "No detailed information is available for books on the device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
+msgid "Error talking to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
+msgid ""
+"There was a temporary error talking to the device. Please unplug and "
+"reconnect the device and or reboot."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
+msgid "Conversion Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
+msgid ""
+"<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
+"first remove the DRM using 3rd party tools."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
+msgid "Database does not exist"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
+msgid ""
+"The directory in which the database should be: %s no longer exists. Please "
+"choose a new database location."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
+msgid "Choose new location for database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
+msgid ""
+"is the result of the efforts of many volunteers from all over the world. If "
+"you find it useful, please consider donating to support its development."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
+msgid "There are active jobs. Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
+msgid ""
+" is communicating with the device!<br>\n"
+"                  'Quitting may cause corruption on the device.<br>\n"
+"                  'Are you sure you want to quit?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
+msgid "WARNING: Active jobs"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
+msgid ""
+"will keep running in the system tray. To close it, choose <b>Quit</b> in the "
+"context menu of the system tray."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
+msgid ""
+"<span style=\"color:red; font-weight:bold\">Latest version: <a "
+"href=\"%s\">%s</a></span>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
+msgid ""
+"%s has been updated to version %s. See the <a "
+"href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
+"Visit the download page?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
+msgid "Update available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
+msgid "Use the library located at the specified path."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
+msgid "Log debugging information to console"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
+msgid "calibre"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
+msgid "Advanced search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
+msgid "Alt+S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
+msgid "&Search:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
+msgid ""
+"Search the list of books by title or author<br><br>Words separated by spaces "
+"are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
+msgid ""
+"Search the list of books by title, author, publisher, tags and "
+"comments<br><br>Words separated by spaces are ANDed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
+msgid "Reset Quick Search"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
+msgid "Match any"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
+msgid "Match all"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
+msgid "Sort by &popularity"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
+msgid "Add books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
+msgid "A"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
+msgid "Remove books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
+msgid "Del"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
+msgid "Edit meta information"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
+msgid "E"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
+msgid "Send to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
+msgid "S"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
+msgid "Fetch news"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
+msgid "F"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
+msgid "Convert E-books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
+msgid "C"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
+msgid "V"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
+msgid ""
+"Redirect console output to a dialog window (both stdout and stderr). Useful "
+"on windows where GUI apps do not have a output streams."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:58
+msgid "ERROR: Unhandled exception"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
+msgid "Jobs:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
+msgid "Click to see list of active jobs."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
+msgid "Click to browse books by their covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
+msgid "Click to turn off Cover Browsing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
+msgid ""
+"<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
+"module failed:<br>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
+msgid "Click to browse books by tags"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+msgid "Authors"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+msgid "Publishers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:106
+msgid "Convert book: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:78
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:140
+msgid "Convert comic: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:255
+msgid "Starting Bulk conversion of %d books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:226
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:322
+msgid "Convert book %d of %d (%s)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:331
+msgid ""
+"<p>Could not convert %d of %d books, because no suitable source format was "
+"found.<ul>%s</ul>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:236
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:332
+msgid "Could not convert some books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:375
+msgid "Fetch news from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:372
+msgid "You must set a username and password for %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:101
+msgid "Configure Ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:102
+msgid "&Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:103
+msgid "Se&rif family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:104
+msgid "&Sans family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:105
+msgid "&Monospace family:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:106
+msgid "&Default font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:108
+msgid "Monospace &font size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:110
+msgid "S&tandard font:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:111
+msgid "Serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:112
+msgid "Sans-serif"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:113
+msgid "Monospace"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/config_ui.py:114
+msgid "&User stylesheet"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:49
+msgid "Options to customize the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:82
+msgid ""
+"Set the user CSS stylesheet. This can be used to customize the look of all "
+"books."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:58
+msgid "Font options"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:59
+msgid "The serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:60
+msgid "The sans-serif font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:61
+msgid "The monospaced font family"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:62
+msgid "The standard font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:63
+msgid "The monospaced font size in px"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/documentview.py:64
+msgid "The standard font type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+msgid "Table of Contents"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:166
+msgid "Go to..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:207
+msgid "Position in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:208
+msgid "/Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:213
+msgid "Go to a reference. To get reference numbers, use the reference mode."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:219
+msgid "Search for text in book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
+msgid "Choose ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
+msgid "Ebooks"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
+msgid "Add bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
+msgid "Enter title for bookmark:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
+msgid "No matches found for: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
+msgid "Loading flow..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
+msgid "Laying out %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
+msgid "Loading ebook..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
+msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
+msgid "DRM Error"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
+msgid "Could not open ebook"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
+msgid "<b>%s</b><br/><p>%s</p>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
+msgid "Options to control the ebook viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
+msgid ""
+"%prog [options] file\n"
+"\n"
+"View an ebook.  \n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+msgid "Ebook Viewer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+msgid "toolBar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+msgid "Next page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+msgid "Previous page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+msgid "Font size larger"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+msgid "Font size smaller"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
+msgid "Find next"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
+msgid "Copy to clipboard"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
+msgid "Preferences"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
+msgid "Reference Mode"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
+msgid "Bookmark"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
+msgid "Invalid regular expression"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:48
+msgid "Invalid regular expression: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
+msgid ""
+"Reader\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
+msgid ""
+"Card\n"
+"%s\n"
+"available"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
+msgid "Click to see the list of books available on your computer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
+msgid "Click to see the list of books in the main memory of your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
+msgid "Click to see the list of books on the storage card in your reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:16
+msgid "Settings to control the calibre content server"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:20
+msgid "The port on which to listen. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:22
+msgid "The server timeout in seconds. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:24
+msgid "The max number of worker threads to use. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:26
+msgid "Set a password to restrict access. By default access is unrestricted."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:28
+msgid "Username for access. By default, it is: %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:95
+msgid ""
+"Path to the calibre library. Default is to use the path stored in the "
+"settings."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:172
+msgid ""
+"%prog list [options]\n"
+"\n"
+"List the books available in the calibre database.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:180
+msgid ""
+"The fields to display when listing books in the database. Should be a comma "
+"separated list of fields.\n"
+"Available fields: %s\n"
+"Default: %%default. The special field \"all\" can be used to select all "
+"fields. Only has effect in the text output format."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:182
+msgid ""
+"The field by which to sort the results.\n"
+"Available fields: %s\n"
+"Default: %%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:184
+msgid "Sort results in ascending order"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:186
+msgid ""
+"Filter the results by the search query. For the format of the search query, "
+"please see the search related documentation in the User Manual. Default is "
+"to do no filtering."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:188
+msgid ""
+"The maximum width of a single line in the output. Defaults to detecting "
+"screen size."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:189
+msgid "The string used to separate fields. Default is a space."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:190
+msgid ""
+"The prefix for all file paths. Default is the absolute path to the library "
+"folder."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:193
+msgid ""
+"The format in which to output the data. Available choices: %s. Defaults is "
+"text."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:201
+msgid "Invalid fields. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:208
+msgid "Invalid sort field. Available fields:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:274
+msgid ""
+"The following books were not added as they already exist in the database "
+"(see --duplicates option):"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:298
+msgid ""
+"%prog add [options] file1 file2 file3 ...\n"
+"\n"
+"Add the specified files as books to the database. You can also specify "
+"directories, see\n"
+"the directory related options below.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:307
+msgid ""
+"Assume that each directory has only a single logical book and that all files "
+"in it are different e-book formats of that book"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:309
+msgid "Process directories recursively"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:311
+msgid ""
+"Add books to database even if they already exist. Comparison is done based "
+"on book titles."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:316
+msgid "You must specify at least one file to add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:334
+msgid ""
+"%prog remove ids\n"
+"\n"
+"Remove the books identified by ids from the database. ids should be a comma "
+"separated list of id numbers (you can get id numbers by using the list "
+"command). For example, 23,34,57-85\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:346
+msgid "You must specify at least one book to remove"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:366
+msgid ""
+"%prog add_format [options] id ebook_file\n"
+"\n"
+"Add the ebook in ebook_file to the available formats for the logical book "
+"identified by id. You can get id by using the list command. If the format "
+"already exists, it is replaced.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:377
+msgid "You must specify an id and an ebook file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:382
+msgid "ebook file must have an extension"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:390
+msgid ""
+"\n"
+"%prog remove_format [options] id fmt\n"
+"\n"
+"Remove the format fmt from the logical book identified by id. You can get id "
+"by using the list command. fmt should be a file extension like LRF or TXT or "
+"EPUB. If the logical book does not have fmt available, do nothing.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:403
+msgid "You must specify an id and a format"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:421
+msgid ""
+"\n"
+"%prog show_metadata [options] id\n"
+"\n"
+"Show the metadata stored in the calibre database for the book identified by "
+"id.\n"
+"id is an id number from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:429
+msgid "Print metadata in OPF form (XML)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:434
+msgid "You must specify an id"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:448
+msgid ""
+"\n"
+"%prog set_metadata [options] id /path/to/metadata.opf\n"
+"\n"
+"Set the metadata stored in the calibre database for the book identified by "
+"id\n"
+"from the OPF file metadata.opf. id is an id number from the list command. "
+"You\n"
+"can get a quick feel for the OPF format by using the --as-opf switch to the\n"
+"show_metadata command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:461
+msgid "You must specify an id and a metadata file"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:473
+msgid ""
+"%prog export [options] ids\n"
+"\n"
+"Export the books specified by ids (a comma separated list) to the "
+"filesystem.\n"
+"The export operation saves all formats of the book, its cover and metadata "
+"(in\n"
+"an opf file). You can get id numbers from the list command.\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:481
+msgid "Export all books in database, ignoring the list of ids."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:483
+msgid "Export books to the specified directory. Default is"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:485
+msgid "Export all books into a single directory"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:487
+msgid "Create file names as author - title instead of title - author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:492
+msgid "You must specify some ids or the %s option"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:502
+msgid ""
+"%%prog command [options] [arguments]\n"
+"\n"
+"%%prog is the command line interface to the calibre books database.\n"
+"\n"
+"command is one of:\n"
+"  %s\n"
+"\n"
+"For help on an individual command: %%prog command --help\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
+msgid "<p>Copying books to %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
+msgid "Copying <b>%s</b>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
+msgid "<p>Migrating old database to ebook library in %s<br><center>"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
+msgid "Compacting database"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
+msgid "Password to access your calibre library. Username is "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
+msgid ""
+"[options]\n"
+"\n"
+"Start the calibre content server."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
+msgid "Could not launch worker process."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
+msgid "Job stopped by user"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
+msgid "%sUsage%s: %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
+msgid "Created by "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
+msgid "Path to the database in which books are stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
+msgid "Pattern to guess metadata from filenames"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
+msgid "Access key for isbndb.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
+msgid "Default timeout for network operations (seconds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
+msgid "Path to directory in which your library of books is stored"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
+msgid "The language in which to display the user interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr "Å tandardnĆ½ vĆ½stupnĆ½ formĆ”t pre prevody knĆ­h."
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
+msgid "Read metadata from files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
+msgid "Could not initialize the fontconfig library"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:53
+msgid "URL must have the scheme sftp"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:57
+msgid "host must be of the form user@hostname"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:68
+msgid "Failed to negotiate SSH session: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/sftp.py:71
+msgid "Failed to authenticate with server: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
+msgid "Unknown feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
+msgid "Untitled article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:15
+msgid "Options to control the fetching of periodical content from the web."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:18
+msgid "Customize the download engine"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
+msgid ""
+"Timeout in seconds to wait for a response from the server. Default: %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
+msgid ""
+"Minimum interval in seconds between consecutive fetches. Default is %default "
+"s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
+msgid ""
+"The character encoding for the websites you are trying to download. The "
+"default is to try and guess the encoding."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
+msgid ""
+"Only links that match this regular expression will be followed. This option "
+"can be specified multiple times, in which case as long as a link matches any "
+"one regexp, it will be followed. By default all links are followed."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
+msgid ""
+"Any link that matches this regular expression will be ignored. This option "
+"can be specified multiple times, in which case as long as any regexp matches "
+"a link, it will be ignored.By default, no links are ignored. If both --"
+"filter-regexp and --match-regexp are specified, then --filter-regexp is "
+"applied first."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+msgid "Do not download CSS stylesheets."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:33
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:88
+msgid ""
+"Specify a list of feeds to download. For example: \n"
+"\"['http://feeds.newsweek.com/newsweek/TopNews', "
+"'http://feeds.newsweek.com/headlines/politics']\"\n"
+"If you specify this option, any argument to %prog is ignored and a default "
+"recipe is used to download the feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:37
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:92
+msgid "Be more verbose while processing."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:39
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:94
+msgid ""
+"The title for this recipe. Used as the title for any ebooks created from the "
+"downloaded feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:41
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:95
+msgid "Username for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:43
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:96
+msgid "Password for sites that require a login to access content."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:49
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:99
+msgid ""
+"Number of levels of links to follow on webpages that are linked to from "
+"feeds. Defaul %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:51
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:101
+msgid ""
+"The directory in which to store the downloaded feeds. Defaults to the "
+"current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:53
+msgid "Don't show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:55
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:105
+msgid "Very verbose output, useful for debugging."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:57
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:107
+msgid ""
+"Useful for recipe development. Forces max_articles_per_feed to 2 and "
+"downloads at most 2 feeds."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:61
+msgid ""
+"%%prog [options] ARG\n"
+"\n"
+"%%prog parses an online source of articles, like an RSS or ATOM feed and \n"
+"fetches the article contents organized in a nice hierarchy.\n"
+"\n"
+"ARG can be one of:\n"
+"\n"
+"file name            - %%prog will try to load a recipe from the file\n"
+"\n"
+"builtin recipe title - %%prog will load the builtin recipe and use it to "
+"fetch the feed. For e.g. Newsweek or \"The BBC\" or \"The New York Times\"\n"
+"\n"
+"recipe as a string   - %%prog will load the recipe directly from the string "
+"arg.\n"
+"\n"
+"Available builtin recipes are:\n"
+"%s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:85
+msgid ""
+"Options to control web2disk (used to fetch websites linked from feeds)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:103
+msgid "Dont show the progress bar"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
+msgid "Fetching feeds..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
+msgid "Unknown News Source"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
+msgid "Download finished"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
+msgid "Failed to download the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
+msgid " from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
+msgid "Failed to download parts of the following articles:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
+msgid "\tFailed links:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
+msgid "Could not fetch article. Run with --debug to see the reason"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
+msgid "Got feeds from index page"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
+msgid "Trying to download cover..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
+msgid "Starting download [%d thread(s)]..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
+msgid "Feeds downloaded to %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
+msgid "Could not download cover: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
+msgid "Downloading cover from %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
+msgid "Untitled Article"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
+msgid ""
+"\n"
+"Downloaded article %s from %s\n"
+"%s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
+msgid "Article downloaded: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
+msgid "Failed to download article: %s from %s\n"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
+msgid "Article download failed: %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
+msgid "Fetching feed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
+msgid ""
+"%prog URL\n"
+"\n"
+"Where URL is for example http://google.com"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
+msgid "Base directory into which URL is saved. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
+msgid ""
+"Maximum number of levels to recurse i.e. depth of links to follow. Default "
+"%default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
+msgid ""
+"The maximum number of files to download. This only applies to files from <a "
+"href> tags. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
+msgid "Show detailed output information. Useful for debugging"
+msgstr ""
+
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "VyžadovaÅ„ potvrdenie pred &zmazanĆ­m sĆŗborov."
+
+#~ msgid ""
+#~ "%%prog [options] filename\n"
+#~ "\n"
+#~ "Convert any of a large number of ebook formats to an epub file. Supported "
+#~ "formats are: %s\n"
+#~ msgstr ""
+#~ "%%prog [možnosti] sĆŗbor\n"
+#~ "\n"
+#~ "Konverzia jednĆ©ho z mnohĆ½ch podporovanĆ½ch formĆ”tov elektronickĆ½ch knĆ­h do "
+#~ "sĆŗboru EPUB. PodporovanĆ© formĆ”ty sĆŗ: %s\n"
+
+#~ msgid "LRF"
+#~ msgstr "LRF"
+
+#~ msgid "EPUB"
+#~ msgstr "EPUB"
+
+#~ msgid "&Output format:"
+#~ msgstr "&VĆ½stupnĆ½ formĆ”t:"
+
+#~ msgid ""
+#~ "If you disable this setting, metadatas is guessed from the filename instead. "
+#~ "This can be configured in the Advanced section."
+#~ msgstr ""
+#~ "Keď je tĆ”to možnosÅ„ deaktivovanĆ”, metadĆ”ta budĆŗ odvodenĆ© z nĆ”zvu sĆŗboru. "
+#~ "SpĆ“sob, akĆ½m budĆŗ odvodenĆ©, je možnĆ© nastaviÅ„ v sekcii \"RozÅ”Ć­renĆ©\"."
diff --git a/src/calibre/translations/sl.po b/src/calibre/translations/sl.po
index 1d82bfb76c..9cd2491f30 100644
--- a/src/calibre/translations/sl.po
+++ b/src/calibre/translations/sl.po
@@ -6,57 +6,231 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre 0.4.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
-"PO-Revision-Date: 2008-09-19 19:17+0000\n"
-"Last-Translator: Kovid Goyal <Unknown>\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
+"PO-Revision-Date: 2008-12-30 07:52+0000\n"
+"Last-Translator: Janko SlatenŔek <Unknown>\n"
 "Language-Team: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Generated-By: pygettext.py 1.5\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr "Ne naredi popolnoma nič"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr "Neznano"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr "Osnovno"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr "Tip datoteke"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr "Bralnik meta podatkov"
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr "Pisalnik meta podatkov"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr "Preberi meta podatke iz %s datotek"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr "Nastavi meta podatke v EPUB datotekah"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr "Nastavi meta podatke v LRF datotekah"
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr "Nastavi meta podatke v RTF datotekah"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr "NameŔčeni plugini"
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr "Zaznava diska v pogonu %s ni mogoča. Poskusite s ponovnim zagonom."
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "Reader nima vstavljene spominske kartice."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr "Možnosti za nadzor konverzije v EPUB"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 "Izhodna datoteka EPUB. Če ni določena, se izpelje iz imena vhodne datoteke."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr "Nadzor samodejnega zaznavanja strukture dokumenta."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -70,7 +244,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -78,17 +252,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -97,38 +271,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr "Ne dodaj samodejno zaznanih poglavij v Kazalo."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -136,134 +310,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr "Neznano"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -274,8 +396,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr "Izbrati morate vhodno HTML datoteko"
 
@@ -288,30 +415,30 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr "Obdelane HTML datoteke so zapisane v "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr "Možnosti za nadzor sprehajanja po HTML"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr "Izhodni direktorij. Privzeti je trenutni direktorij."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 "Kodna tabela znakov za HTML datoteke. Privzeto je samodejno zaznavanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
@@ -319,11 +446,11 @@ msgstr ""
 "Ustvari izhodne podatke v zip datoteki. Če je izbrana ta možnost mora biti --"
 "output ime datoteke, ne direktorija."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr "Nadzira sledeče povezave v HTML datotekah."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
@@ -331,7 +458,7 @@ msgstr ""
 "Po povezavah v HTML datoteki se sprehodi najprej po Ŕirini. Običajno se "
 "najprej sprehodi po globini"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
@@ -340,49 +467,49 @@ msgstr ""
 "biti pozitivna vrednost. 0 pomeni da se ne sledi nobeni povezavi v osnovni "
 "HTML datoteki."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr "Nastavi meta podatke od generirane eknjige"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr "Nastavi naslov. Privzeto je samodejno zaznavanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr "Avtor(ji) eknjige v, z vejicami ločenem, seznamu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr "Možnosti koristne za razhroŔčevanje"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr "Izhodni HTML je \"lepo oblikovan\" za lažje analiziranje"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -395,28 +522,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr "%prog [options] LITFILE"
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr "Izhodni direktorij. Privzet je trenutni direktorij."
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr "%prog [options] LITFILE"
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr "Izhodni direktorij. Privzet je trenutni direktorij."
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr "Koristno za razhroŔčevanje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr "OEB eknjiga ustvarjena v"
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr "Nastavi naslov. Privzeto: filename."
@@ -447,7 +587,7 @@ msgstr "Sortirni ključ za avtorja"
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "Založnik"
 
@@ -743,11 +883,11 @@ msgstr ""
 "računalnikov z MS Windows operacijskim sistemom je cp-1252. Druga pogosta "
 "kodna tabela je utf-8. Privzeto je ugibanje tipa kodne tabele."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -765,70 +905,70 @@ msgstr ""
 "ZIP arhive in poiskal eknjige znotraj njih.\n"
 "    "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr "Nobena datoteka ni določena za pretvorbo."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr "Upodobljen %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr "NeuspeŔno %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr "Možnosti za nadzor pretvorbe stripov (CBR, CBZ) v eknjige."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr "Naslov ustvarjene eknjige. Privzeta je uporaba imena datoteke."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
 "Set the author in the metadata of the generated ebook. Default is %default"
 msgstr ""
 "Nastavi avtorja v meta podatkih ustvarjene eknjige. Privzeto je %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
 msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr "Å tevilo barv za sivinsko pretvorbo slike. Privzeto: %default"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 "Onemogoči normalizacijo (izboljŔaj kontrast) barvnega razpona za slike. "
 "Privzeto: False"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 "Obdrži razmerje slike. Privzeto je da se prilagodi velikosti zaslona."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr "Onemogoči ostrenje."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr "Ne razdeli panoramskih slik v dve portretni"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
@@ -836,7 +976,7 @@ msgstr ""
 "Obdrži razmerje pri skaliranju slik in uporabi viŔino zaslona za Ŕirino "
 "slike pri pregledovanju v panoramskem načinu."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
@@ -844,13 +984,13 @@ msgstr ""
 "Uporablja se za izdaje, ki se berejo od desne proti levi tako kot manga. "
 "Panoramske slike se razdelijo v portretne strani od desne proti levi."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
@@ -858,35 +998,35 @@ msgstr ""
 "Ne razvrŔčaj datotek, ki se nahajajo v arhivu stripa po imenu. UpoŔtevaj "
 "vrstni red v katerem so bile dane v strip."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr "Ne pokaži indikatorja napredka."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr "Izhod se zapiŔe v"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr "Upodabljam strani stripa ..."
 
@@ -935,56 +1075,56 @@ msgstr "Možnosti za nadzor obnaŔanja html2lrf"
 msgid "Fetching of recipe failed: "
 msgstr "Prenos recepta ni uspel: "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr "\tBook Designer datoteka zaznana."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr "\tParsanje HTML ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr "\tBaen datoteka zaznana. Ponovno parsanje ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr "Preprocesiran HTML zapisan v "
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr "Procesiranje %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr "\tPretvarjanje v BBeB ..."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr "Parsanje datoteke ni mogoče: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr "%s je prazna datoteka"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr "NeuspeŔno parsanje povezave %s %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr "Dodajanje povezave %s v kazalo ni možno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr "Procesiranje slikovne datoteke %s ni možno. Napaka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr "Procesiranje interlaced PNG %s ni možno"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
@@ -992,13 +1132,13 @@ msgstr ""
 "NeuspeŔno procesiranje slike: %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 "PriŔlo je do napake pri obdelavi tabele: %s. Zgradba tabele se ignorira."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
@@ -1006,11 +1146,11 @@ msgstr ""
 "Slaba tabela:\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr "Tabela vsebuje preveliko celico"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
@@ -1018,19 +1158,19 @@ msgstr ""
 "Spletno stran %s najprej shranite kot html datoteko nato pa na njej "
 "uporabite html2lrf."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr "Branje slike naslovne strani ni mogoče: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr "Ne morem brati iz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr "Napaka pri obdelavi opf datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1273,17 +1413,17 @@ msgstr "Nastavi opombe"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "Naslov"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "Avtor(ji)"
 
@@ -1302,25 +1442,25 @@ msgstr "Kategorija"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "Opombe"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr "Značke"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr "Serija"
@@ -1329,23 +1469,23 @@ msgstr "Serija"
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr "Z vejico ločen seznam značk, ki se nastavi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1440,7 +1580,7 @@ msgstr "Uporaba: %s datoteka.lit"
 msgid "Cover saved to"
 msgstr "Naslovnica shranjena v"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1452,11 +1592,11 @@ msgstr "Uporaba: pdf-meta datoteka.pdf"
 msgid "Usage: rb-meta file.rb"
 msgstr "Uporaba: rb-meta datoteka.rb"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr "%prog [options] mojaeknjiga.mobi"
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr "Neobdelan MOBI HTML shranjen v"
 
@@ -1465,7 +1605,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr "Pogosto rabljeni direktoriji"
 
@@ -1533,6 +1673,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr "Naprava ni več priklopljena."
@@ -1568,9 +1720,9 @@ msgstr "Poglej knjigo na napravi"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr "Pot"
 
@@ -1578,8 +1730,8 @@ msgstr "Pot"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr "Formati"
@@ -1593,6 +1745,7 @@ msgstr "Dialog"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1668,68 +1821,128 @@ msgstr "De&speckle"
 msgid "&Wide"
 msgstr "&Å iroko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "Napredno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr "Napačna lokacija podatkovne baze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr "<br>Mora biti direktorij."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr "Napačna lokacija podatkovne baze "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr "Napačna lokacija podatkovne baze. <br>Ne morem pisati v "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr "Krčenje podatkovne baze. To lahko traja nekaj časa."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr "Krčenje ..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "Konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
@@ -1737,16 +1950,17 @@ msgstr ""
 "&Lokacija eknjig (eKnjige so shranjene v datoteke sortirane po avtorjih, "
 "meta podatki pa v datoteki metadata.db)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr "Prebrskaj za novo lokacijo podatkovne baze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1762,191 +1976,204 @@ msgstr "Prebrskaj za novo lokacijo podatkovne baze"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr "Opozori me, ko je na voljo &nova verzija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr "VpraŔaj za &potrditev pred brisanjem datotek."
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr "Format za &shranjevanje enojne datoteke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr "&Prioriteta za pretvorne posle:"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr "Privzeti omrežni &timeout:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " sekund"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr "Dodaj direktorij k seznamu pogosto rabljenih direktorijev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr "Odstrani direktorij iz seznama pogosto rabljenih direktorijev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr "Uporabi &rimska Ŕtevila za Ŕtevilke serij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 "Število &naslovnic, ki se prikažejo v preletavanju naslovnic (po ponovnem "
 "zagonu):"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "Orodna vrstica"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr "Veliko"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr "Srednje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "Majhno"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr "Velikost gum&ba orodne vrstice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr "Prikaži &tekst pri gumbih v orodni vrstici"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr "Izberi vidne stolp&ce v knjižničnem pogledu"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr "Sprosti neuporabljen prostor iz baze podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr "&Skrči podatkovno bazo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr "&Meta podatki iz imena datoteke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr "&UporabniŔko ime:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&Geslo:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr "&Prikaži geslo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1955,6 +2182,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "NAPAKA"
@@ -1972,7 +2237,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr "Meta podatki"
 
@@ -2026,25 +2291,25 @@ msgstr "Izberi naslovnico za "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr "Ne morem prebrati"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr "Nimate pravic za branje datoteke: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr "Napaka pri branju zbirke"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr "<p>PriŔlo je do napake pri branju iz zbirke: <br /><b>"
 
@@ -2054,7 +2319,7 @@ msgid " is not a valid picture"
 msgstr " ni veljavna slika"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr "Pretvorba ni možna"
 
@@ -2095,22 +2360,22 @@ msgid "Book Cover"
 msgstr "Naslovna Stran"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr "Uporabi na&slovnico iz izvorne datoteke"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr "Spremeni &sliko naslovne strani:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr "Izberi sliko, ki bo uporabljena za naslovnico te knjige."
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr "Uporabi na&slovnico iz izvorne datoteke"
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -2125,14 +2390,14 @@ msgstr "Spremeni naslov knjige"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr "&Avtor(ji): "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -2154,14 +2419,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr "&Založnik: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr "Spremeni založnika te knjige"
@@ -2174,7 +2439,7 @@ msgstr "&Značke: "
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2185,7 +2450,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr "&Serije:"
@@ -2194,8 +2459,8 @@ msgstr "&Serije:"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2620,25 +2885,25 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr "Uredi Meta podatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr "Meta podatki"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr "&RazvrŔčanje Avtorjev: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
@@ -2647,47 +2912,51 @@ msgstr ""
 "Določi kako se sortirajo avtor(ji) te knige. Naprimer Charles Dickens se "
 "sortira kot Dickens, Charles."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr "&Ocena:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr "Ocena za to knjigo. 0-5 zvezdic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr " zvezdic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr "Dodaj &Značke: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr "Odpri Urejevalnik Značk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr "Odst&rani značke:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr "Z vejico ločen seznam značk, ki bodo odstranjene iz knjig. "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
@@ -2697,19 +2966,19 @@ msgstr ""
 "gesla Ŕe nimate se lahko <a "
 "href='http://www.librarything.com'>registrirate</a> zastonj!</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr "<b>Prenos naslovnice ni uspel.</b><br/>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr "Prenos naslovnice ni uspel"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr "Prenos naslovnice ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr "Določiti morate ISBN oznako te knjige."
 
@@ -2772,93 +3041,112 @@ msgstr "Spremeni geslo"
 msgid "Password needed"
 msgstr "Potrebno je geslo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr "Dodaj vir novic po meri"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr "Recepti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " dni"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -3014,25 +3302,25 @@ msgstr "Ta feed je že bil dodan v recept"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr "Nepravilen vnos"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr "<p>Kreiranje recepta ni bilo mogoče. Napaka:<br>%s"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr "Zamenjam recept?"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr "Vir novic po meri z imenom %s že obstaja. Ga želite zamenjati?"
 
@@ -3044,7 +3332,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr "Izberite recept"
 
@@ -3277,52 +3565,62 @@ msgstr "Čakam"
 msgid "Working"
 msgstr "Delam"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr "Prekinitev posla ni mogoča"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr "Ne morem prekiniti poslov, ki komunicirajo z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr "Posel je že bil pognan"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "Velikost (MB)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "Datum"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr "Ocena"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr "Nič"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr "Knjiga <font face=\"serif\">%s</font> od %s."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr "Format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr "Časovna znamka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr "Najdi (Za Napredno Iskanje pritisnite gumb na levi)"
 
@@ -3351,7 +3649,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr "<b>Ni zadetkov</b> za iskalni niz <i>%s</i>."
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr "Nič zadetkov najdenih"
 
@@ -3376,12 +3674,12 @@ msgid "Previous Page"
 msgstr "PrejŔnja Stran"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "Nazaj"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "Naprej"
 
@@ -3390,7 +3688,7 @@ msgid "Next match"
 msgstr "Naslednji zadetek"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr "Odpri eknjigo"
 
@@ -3398,23 +3696,27 @@ msgstr "Odpri eknjigo"
 msgid "Configure"
 msgstr "Nastavi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr "Napaka pri komuniciranju z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
@@ -3422,126 +3724,126 @@ msgstr ""
 "<p>Za pomoč obiŔčite <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr "PoŔlji v glavni pomnilnik"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr "PoŔlji v spominsko kartico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr "in izbriŔi iz knjižnice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr "Privzeto poŔlji v spominsko kartico"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr "Posamično urejanje meta podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr "Paketno urejanje meta podatkov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr "Dodaj knjige iz enega direktorija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
-"Dodaj knjige rekurzivno (Ena knjiga na direktorij, privzame da je vsaka "
-"datoteka ista eknjiga v različnih formatih)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
-"Dodaj knjige rekurzivno (Več knjig na direktorij, privzame da je vsaka "
-"datoteka različna knjiga)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr "Shrani na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr "Shrani na disk v en direktorij"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr "Shrani samo %s format na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr "Poglej"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr "Poglej specifičen format"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr "Posamična pretvorba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr "Paketna pretvorba"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr "Nastavi privzete možnosti za pretvorbo stripov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr "Izberite lokacijo za vaŔo eKnjižnico."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr "Selitev podatkovne baze"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr "Naprava: "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr " zaznan."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr "Povezan "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr "Podatkovna baza poŔkodovana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3571,107 +3873,143 @@ msgstr ""
 "                </ol>\n"
 "                "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 "<p>Knjige z istim naslovom že obstajajo v bazi. Jih vseeno dodam?<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr "Duplikati najdeni!"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr "PrenaŔanje knjig na napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr "Na napravi ni več prostora"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 "<p>Prenos knjig na napravo ni mogoč, ker na napravi ni dovolj prostora "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
-msgstr "Potrdite brisanje"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr "Ali ste prepričani da želite izbrisati teh %d knjig?"
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr "IzbriŔi knjige iz naprave."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr "Spreminjanje meta podatkov ni mogoče"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr "Nobena od knjig ni izbrana."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr "PoŔlji knjige v napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr "Ni ustreznih formatov"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
@@ -3679,15 +4017,15 @@ msgstr ""
 "Prenos sledečih knjig ni uspel, ker ni bil najden potreben "
 "format:<br><ul>%s</ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr "Ne morem shraniti na disk"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
@@ -3695,59 +4033,64 @@ msgstr ""
 "<p>Prenos sledečih knjig na disk ni uspek, ker %s format ni na voljo "
 "zanje:<ul>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr "Nekaterih knjig ni bilo mogoče shraniti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr "PrenaŔam novice iz "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr "Nobena od knjig ni izbrana"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr "Pogled ni možen"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr "Izberite format, ki ga želite videti"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr "%s nima razpoložljivih formatov."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr "Nemogoča konfiguracija"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr "Spreminjanje konfiguracije med poganjanjem poslov ni mogoče."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr "Kopiram knjižnico v "
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr "Neustrezna podatkovna baza"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
@@ -3755,23 +4098,23 @@ msgstr ""
 "<p>Neveljavna podatkovna baza že obstaja v %s, izbriŔite jo preden poskusite "
 "premakniti obstoječo podatkovno bazo.<br>Napaka: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr "Premik podatkovne baze ni bil mogoč"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr "Podrobne informacije niso na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr "Podrobne informacije za knjige na napravi niso na voljo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr "Napaka pri pogovoru z napravo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
@@ -3779,23 +4122,23 @@ msgstr ""
 "PriŔlo je do napake pri komuniciranju z napravo. Prosim ponovno zaženite ali "
 "izklopite in ponovno vklopite napravo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr "Pretvorna Napaka"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr "Podatkovna baza ne obstaja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
@@ -3803,38 +4146,38 @@ msgstr ""
 "Direktorij v katerem naj bi bila podatkovna baza: %s ne obstaja več. Prosim "
 "izberite novo lokacijo."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr "Izberite novo lokacijo za podatkovno bazo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
@@ -3842,7 +4185,7 @@ msgstr ""
 "<span style=\"color:red; font-weight:bold\">Zadnja verzija: <a "
 "href=\"%s\">%s</a></span>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
@@ -3852,39 +4195,39 @@ msgstr ""
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">seznam "
 "posodobitev</a>. Prikažem domačo stran?"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr "Navoljo je posodobitev"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr "calibre"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr "Napredno iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr "Alt+S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr "I&skanje:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
@@ -3892,7 +4235,7 @@ msgstr ""
 "Iskanje knjig po naslovu ali avtorju<br><br>Besede ločene s presledkom se "
 "obravnavajo po pravilu IN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
@@ -3900,75 +4243,99 @@ msgstr ""
 "Iskanje knjig po naslovu, avtorju, založniku, značkah ali "
 "opombah<br><br>Besede ločene s presledkom se obravnavajo po pravilu IN"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr "Resetiraj Hitro Iskanje"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr "Dodaj knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr "A"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr "Odstrani knjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr "Del"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr "Uredi meta podatke"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr "E"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr "PoŔlji napravi"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr "S"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr "Prenesi novice"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr "F"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr "Pretvori eKnjige"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr "C"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr "V"
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3981,23 +4348,23 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr "NAPAKA: Neobdelana izjema"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr "Posli:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr "Klikni za seznam aktivnih poslov."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr "Kliknite za izbiranje knjig po platnici."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr "Pritisnite za izklop Preletavanja Platnic"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
@@ -4005,7 +4372,7 @@ msgstr ""
 "<p>Izbiranje knjig po platnici je onemogočeno.<br>Uvoz pictureflow modula ni "
 "uspel:<br>"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -4150,7 +4517,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -4174,109 +4541,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr "Neveljaven regularni izraz"
@@ -4285,37 +4656,38 @@ msgstr "Neveljaven regularni izraz"
 msgid "Invalid regular expression: %s"
 msgstr "Neveljaven regularni izraz: %s"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
-msgstr "Knjižnica"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
+msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Reader\n"
-"%s je na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
-"Kartica\n"
-"%s je na voljo"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr "Kliknite za seznam knjig, ki so na voljo na vaŔem računalniku"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 "Kliknite za seznam knjig, ki so na voljo v glavnem pomnilniku vaŔega reader-"
 "ja"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 "Kliknite za seznam knjig, ki so na voljo v spominski kartici v vaŔem reader-"
@@ -4345,6 +4717,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4630,79 +5006,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr "Kopiram <b>%s</b>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr "<p>Selitev stare podatkovne baze v knjižnico eknjig v %s<br><center>"
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr "Krčim bazo"
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr "Zagon delovnega procesa ni uspel."
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr "Posel ustavljen s strani uporabnika"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr "%sUporaba%s: %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr "Ustvaril "
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr "Pot do baze v kateri so shranjene knjige"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr "Vzorec za ugotavljanje meta podatkov iz datotek"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr "Vstopni ključ za isbndb.com"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr "Privzet čas neaktivnosti za omrežne operacije (sekunde)"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr "Pot do direktorija v katerem so shranjene vaŔe eknjige"
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr "Inicializacija fontconfig knjižnice ni uspela."
 
@@ -4722,13 +5106,13 @@ msgstr "Avtentikacija SSH seje ni uspela: "
 msgid "Failed to authenticate with server: %s"
 msgstr "Avtentikacija s strežnikom ni uspela: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr "Neznani feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr "Neznan članek"
 
@@ -4741,7 +5125,7 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
@@ -4749,7 +5133,7 @@ msgstr ""
 "Timeout v sekundah za čakanje odgovora od strežnika. Privzeto: %default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
@@ -4757,7 +5141,7 @@ msgstr ""
 "Minimalni interval v sekundah med zaporednimi prenosi. Privzeto: %default s"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
@@ -4766,7 +5150,7 @@ msgstr ""
 "ugibanje uporabljene kodne tabele."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4777,7 +5161,7 @@ msgstr ""
 "izmed regularnih izrazov, se ji bo sledilo. Privzeto se sledi vsem povezavam."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4792,7 +5176,7 @@ msgstr ""
 "upoŔteva --filter-regexp."
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr "Ne prenesi CSS oblikovnih informacij."
 
@@ -4899,68 +5283,68 @@ msgid "Dont show the progress bar"
 msgstr "Ne prikaži indikatorja napredka"
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr "PrenaŔam feed-e..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr "Neznan Vir Novic"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr "Prenos končan"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr "Prenos naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr " iz "
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr "Prenos nekaterih delov od naslednjih člankov ni uspel:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr "\tNeuspeŔne povezave:"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr "Prenos članka ni uspel. Za razlog poženite z --debug možnostjo"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr "Dobljeni feed-i iz indeks strani"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr "PoskuŔam prenesti naslovnico ..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr "Začenjam prenos [%d nit(i)]..."
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr "Feed-i preneŔeni v %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr "Prenos naslovnico ne bil mogoč: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr "PrenaŔam naslovnico iz %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr "Članek brez naslova"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
@@ -4970,23 +5354,23 @@ msgstr ""
 "PreneŔen članek %s iz %s\n"
 "%s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr "Članek preneÅ”en: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr "NeuspeŔen prenos članka: %s iz %s\n"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr "Prenos članka ni uspel: %s"
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr "PrenaŔam feed"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
@@ -4996,18 +5380,18 @@ msgstr ""
 "\n"
 "Kjer je URL naprimer http://google.com"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr "Osnovni direktorij v katerega se shrani URL. Privzet je %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 "Maksimalna globina rekurzije. To je globina povezav. Privzeto %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
@@ -5015,13 +5399,16 @@ msgstr ""
 "Maksimalno Ŕtevilo preneŔenih datotek. To velja samo za datoteke iz <a href> "
 "značk. Privzeto je %default"
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroŔčevanje."
 
 #~ msgid "Basic"
 #~ msgstr "Osnovno"
 
+#~ msgid "&Priority for conversion jobs:"
+#~ msgstr "&Prioriteta za pretvorne posle:"
+
 #~ msgid "Author"
 #~ msgstr "Avtor"
 
@@ -5056,6 +5443,20 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroŔčevanje."
 #~ msgid "Double click to <b>edit</b> me<br><br>"
 #~ msgstr "Dvoklikni me da me <b>urediÅ”</b><br><br>"
 
+#~ msgid ""
+#~ "Add books recursively (One book per directory, assumes every ebook file is "
+#~ "the same book in a different format)"
+#~ msgstr ""
+#~ "Dodaj knjige rekurzivno (Ena knjiga na direktorij, privzame da je vsaka "
+#~ "datoteka ista eknjiga v različnih formatih)"
+
+#~ msgid ""
+#~ "Add books recursively (Multiple books per directory, assumes every ebook "
+#~ "file is a different book)"
+#~ msgstr ""
+#~ "Dodaj knjige rekurzivno (Več knjig na direktorij, privzame da je vsaka "
+#~ "datoteka različna knjiga)"
+
 #~ msgid "News fetched. Uploading to device."
 #~ msgstr "Novice preneŔene. PoŔiljam napravi."
 
@@ -5069,6 +5470,23 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroŔčevanje."
 #~ msgid "Custom news sources"
 #~ msgstr "Viri novic po meri"
 
+#~ msgid "Library"
+#~ msgstr "Knjižnica"
+
+#~ msgid ""
+#~ "Reader\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Reader\n"
+#~ "%s je na voljo"
+
+#~ msgid ""
+#~ "Card\n"
+#~ "%s available"
+#~ msgstr ""
+#~ "Kartica\n"
+#~ "%s je na voljo"
+
 #~ msgid " does not allow copying of text."
 #~ msgstr " ne omogoča kopiranje teksta."
 
@@ -5097,6 +5515,15 @@ msgstr "Podrobneje prikaži izhodne informacije. Koristno za razhroŔčevanje."
 #~ "Izberite profil za napravo za katero generirate to LRF datoteko. Privzeta je "
 #~ "SONY PRS-500 z velikostjo zaslona 584x754 pikslov. Na izbiro imate %s"
 
+#~ msgid "Ask for &confirmation before deleting files"
+#~ msgstr "VpraŔaj za &potrditev pred brisanjem datotek."
+
+#~ msgid "Confirm delete"
+#~ msgstr "Potrdite brisanje"
+
+#~ msgid "Are you sure you want to delete these %d books?"
+#~ msgstr "Ali ste prepričani da želite izbrisati teh %d knjig?"
+
 #~ msgid ""
 #~ "%prog [options] comic.cb[z|r]\n"
 #~ "\n"
diff --git a/src/calibre/translations/sv.po b/src/calibre/translations/sv.po
index 4d9f6c85fa..c94aa8e5f7 100644
--- a/src/calibre/translations/sv.po
+++ b/src/calibre/translations/sv.po
@@ -7,55 +7,229 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-09-14 18:45+0000\n"
 "Last-Translator: Linus C Unneback <linus@folkdatorn.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr "LƤsaren har inga minneskort inkopplade."
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -69,7 +243,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -77,17 +251,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -96,38 +270,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -135,134 +309,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +395,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +414,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +513,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -437,7 +577,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr ""
 
@@ -678,11 +818,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -693,118 +833,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -845,95 +985,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1132,17 +1272,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr ""
 
@@ -1161,25 +1301,25 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1188,23 +1328,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1283,7 +1423,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1435,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,7 +1448,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1376,6 +1516,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1411,9 +1563,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1421,8 +1573,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1436,6 +1588,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1511,83 +1664,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1817,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,6 +2021,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr ""
@@ -1811,7 +2076,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1865,25 +2130,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,7 +2158,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1934,22 +2199,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1964,14 +2229,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,14 +2257,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2012,7 +2277,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,7 +2286,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2030,8 +2295,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2444,91 +2709,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2590,93 +2859,112 @@ msgstr ""
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2826,25 +3114,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,7 +3144,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3086,52 +3374,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3160,7 +3458,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3483,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr ""
 
@@ -3199,7 +3497,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3505,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3666,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,29 +4118,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3912,7 +4283,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3936,109 +4307,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4047,31 +4422,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4479,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4326,79 +4710,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4418,13 +4810,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4437,28 +4829,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +4858,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,7 +4868,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4573,113 +4965,113 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
diff --git a/src/calibre/translations/te.po b/src/calibre/translations/te.po
index 958e70e7ac..6f52206fc6 100644
--- a/src/calibre/translations/te.po
+++ b/src/calibre/translations/te.po
@@ -7,55 +7,229 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calibre\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-11-25 22:18+0000\n"
+"POT-Creation-Date: 2008-12-30 15:33+0000\n"
 "PO-Revision-Date: 2008-06-24 13:22+0000\n"
 "Last-Translator: ą°µą±€ą°µą±†ą°Øą± (Veeven) <Unknown>\n"
 "Language-Team: Telugu <te@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2008-11-28 22:56+0000\n"
+"X-Launchpad-Export-Date: 2009-01-04 04:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:153
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:191
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:219
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:41
+msgid "Does absolutely nothing"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:44
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:478
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:948
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:961
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:292
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:47
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:334
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:449
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:793
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
+#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:37
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:38
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:678
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:912
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
+#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
+#: /home/kovid/work/calibre/src/calibre/library/database.py:920
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
+#: /home/kovid/work/calibre/src/calibre/library/database.py:1580
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:461
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:473
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:808
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:841
+msgid "Unknown"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:62
+msgid "Base"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:148
+msgid "File type"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:182
+msgid "Metadata reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/__init__.py:209
+msgid "Metadata writer"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:12
+msgid ""
+"Follow all local links in an HTML file and create a ZIP file containing all "
+"linked files. This plugin is run every time you add an HTML file to the "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:32
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:42
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:53
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:63
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:73
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:83
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:94
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:105
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:115
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:125
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:135
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:145
+msgid "Read metadata from %s files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:155
+msgid "Extract cover from comic files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:175
+msgid "Set metadata in EPUB files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:185
+msgid "Set metadata in LRF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/builtins.py:195
+msgid "Set metadata in RTF files"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:28
+msgid "Installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:29
+msgid "Mapping for filetype plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:30
+msgid "Local plugin customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:31
+msgid "Disabled plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:66
+msgid "No valid plugin found in "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:170
+msgid "Initialization of plugin %s failed with traceback:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:247
+msgid ""
+"    %prog options\n"
+"    \n"
+"    Customize calibre by loading external plugins.\n"
+"    "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:253
+msgid "Add a plugin by specifying the path to the zip file containing it."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:255
+msgid "Remove a custom plugin by name. Has no effect on builtin plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:257
+msgid ""
+"Customize plugin. Specify name of plugin and customization string separated "
+"by a comma."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:259
+msgid "List all installed plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:261
+msgid "Enable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/ui.py:263
+msgid "Disable the named plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:140
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:158
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:196
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:224
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:407
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:412
 msgid "The reader has no storage card connected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:58
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:92
 msgid "Options to control the conversion to EPUB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
 msgid ""
 "The output EPUB file. If not specified, it is derived from the input file "
 "name."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:71
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
 msgid ""
 "Profile of the target device this EPUB is meant for. Set to None to create a "
 "device independent EPUB. The profile is used for device specific "
 "restrictions on the EPUB. Choices are: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:73
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
 msgid ""
 "Either the path to a CSS stylesheet or raw CSS. This CSS will override any "
 "existing CSS declarations in the source files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:74
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:108
 msgid "Control auto-detection of document structure."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:110
 msgid ""
 "An XPath expression to detect chapter titles. The default is to consider "
 "<h1> or\n"
@@ -69,7 +243,7 @@ msgid ""
 "help on using this feature.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:85
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
 msgid ""
 "Specify how to mark detected chapters. A value of \"pagebreak\" will insert "
 "page breaks before chapters. A value of \"rule\" will insert a line before "
@@ -77,17 +251,17 @@ msgid ""
 "\"both\" will use both page breaks and lines to mark chapters."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:87
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
 msgid "Path to the cover to be used for this book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:90
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:124
 msgid ""
 "Use the cover detected from the source file in preference to the specified "
 "cover."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:93
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
 msgid ""
 "Control the automatic generation of a Table of Contents. If an OPF file is "
 "detected\n"
@@ -96,38 +270,38 @@ msgid ""
 "to auto-generate a Table of Contents.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:99
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:133
 msgid ""
 "Maximum number of links to insert into the TOC. Set to 0 to disable. Default "
 "is: %default. Links are only added to the TOC if less than the --toc-"
 "threshold number of chapters were detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:101
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:135
 msgid "Don't add auto-detected chapters to the Table of Contents."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:103
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:137
 msgid ""
 "If fewer than this number of chapters is detected, then links are added to "
-"the Table of Contents."
+"the Table of Contents. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:105
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:139
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level one. If this is specified, it takes precedence over "
 "other forms of auto-detection."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:107
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:141
 msgid ""
 "XPath expression that specifies all tags that should be added to the Table "
 "of Contents at level two. Each entry is added under the previous level one "
 "entry."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:143
 msgid ""
 "Path to a .ncx file that contains the table of contents to use for this "
 "ebook. The NCX file should contain links relative to the directory it is "
@@ -135,134 +309,82 @@ msgid ""
 "an overview of the NCX format."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:111
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:145
 msgid ""
 "Normally, if the source file already has a Table of Contents, it is used in "
 "preference to the autodetected one. With this option, the autodetected one "
 "is always used."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:113
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:147
 msgid "Control page layout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:149
 msgid "Set the top margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:117
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:151
 msgid "Set the bottom margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:119
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:153
 msgid "Set the left margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:121
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:155
 msgid "Set the right margin in pts. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:123
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:157
 msgid ""
 "The base font size in pts. Default is %defaultpt. Set to 0 to disable "
 "rescaling of fonts."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:125
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:159
 msgid ""
 "Remove spacing between paragraphs. Will not work if the source file forces "
 "inter-paragraph spacing."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:127
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:161
 msgid ""
 "Preserve the HTML tag structure while splitting large HTML files. This is "
 "only neccessary if the HTML files contain CSS that uses sibling selectors. "
 "Enabling this greatly slows down processing of large HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:130
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:164
 msgid "Print generated OPF file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:132
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:166
 msgid "Print generated NCX file to stdout"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:134
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:168
 msgid "Keep intermediate files during processing by html2epub"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:136
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/__init__.py:170
 msgid ""
 "Extract the contents of the produced EPUB file to the specified directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:43
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:477
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:934
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:947
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:77
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:79
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:81
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:86
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:61
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:95
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:97
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/fb2/convert_from.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/pdf/convert_from.py:69
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/rtf/convert_from.py:179
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/txt/convert_from.py:70
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:196
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:226
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:229
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:64
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:66
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:99
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/meta.py:101
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:321
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf.py:436
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:794
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/pdf.py:12
-#: /home/kovid/work/calibre/src/calibre/ebooks/odt/to_oeb.py:46
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:48
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:159
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:365
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:314
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:788
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:560
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:52
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:112
-#: /home/kovid/work/calibre/src/calibre/library/cli.py:245
-#: /home/kovid/work/calibre/src/calibre/library/database.py:920
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1392
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1423
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1452
-#: /home/kovid/work/calibre/src/calibre/library/database.py:1564
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:466
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:478
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:794
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:827
-msgid "Unknown"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:146
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_any.py:156
 msgid ""
 "%%prog [options] filename\n"
 "\n"
-"Convert any of a large number of ebook formats to an epub file. Supported "
+"Convert any of a large number of ebook formats to a %s file. Supported "
 "formats are: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:60
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:100
 msgid "Could not find an ebook inside the archive"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:118
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:158
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -273,8 +395,13 @@ msgid ""
 "the <spine> element of the OPF file.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:346
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1032
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:391
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:739
+msgid "Output written to "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/from_html.py:413
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:1046
 msgid "You must specify an input HTML file"
 msgstr ""
 
@@ -287,93 +414,93 @@ msgid ""
 "Could not find reasonable point at which to split: %s Sub-tree size: %d KB"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:109
+#: /home/kovid/work/calibre/src/calibre/ebooks/epub/split.py:136
 msgid ""
 "\t\tToo much markup. Re-splitting without structure preservation. This may "
 "cause incorrect rendering."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:489
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:490
 msgid "Written processed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:817
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:831
 msgid "Options to control the traversal of HTML"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:824
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
 msgid "The output directory. Default is the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:826
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
 msgid "Character encoding for HTML files. Default is to auto detect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:828
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
 msgid ""
 "Create the output in a zip file. If this option is specified, the --output "
 "should be the name of a file not a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:830
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
 msgid "Control the following of links in HTML files."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:832
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
 msgid ""
 "Traverse links in HTML files breadth first. Normally, they are traversed "
 "depth first"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:834
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
 msgid ""
 "Maximum levels of recursion when following links in HTML files. Must be non-"
 "negative. 0 implies that no links in the root HTML file are followed."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:836
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
 msgid "Set metadata of the generated ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:838
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
 msgid "Set the title. Default is to autodetect."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:840
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
 msgid "The author(s) of the ebook, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:842
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:856
 msgid "The subject(s) of this book, as a comma separated list."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:844
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:858
 msgid "Set the publisher of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:846
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
 msgid "A summary of this book."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:848
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:862
 msgid "Load metadata from the specified OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:850
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:864
 msgid "Options useful for debugging"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:866
 msgid ""
 "Be more verbose while processing. Can be specified multiple times to "
 "increase verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:854
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:868
 msgid "Output HTML is \"pretty printed\" for easier parsing by humans"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:860
+#: /home/kovid/work/calibre/src/calibre/ebooks/html.py:874
 msgid ""
 "%prog [options] file.html|opf\n"
 "\n"
@@ -386,28 +513,41 @@ msgid ""
 "is used.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:840
-msgid "%prog [options] LITFILE"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:843
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:441
-msgid "Output directory. Defaults to current directory."
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:846
-msgid "Legibly format extracted markup. May modify meaningful whitespace."
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/from_any.py:44
+msgid "Creating LIT file from EPUB..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:849
+msgid "%prog [options] LITFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:852
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:444
+msgid "Output directory. Defaults to current directory."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:855
+msgid "Legibly format extracted markup. May modify meaningful whitespace."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:724
 msgid "Useful for debugging."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:860
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:465
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/reader.py:869
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:468
 msgid "OEB ebook created in"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:718
+msgid "%prog [options] OPFFILE"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lit/writer.py:721
+msgid "Output file. Default is derived from input filename."
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:74
 msgid "Set the title. Default: filename."
 msgstr ""
@@ -437,7 +577,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/__init__.py:87
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:275
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:39
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
 msgid "Publisher"
 msgstr "ą°Ŗą±ą°°ą°šą±ą°°ą°£ą°•ą°°ą±ą°¤"
 
@@ -678,11 +818,11 @@ msgid ""
 "default is to try and guess the encoding."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:161
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:164
 msgid "Converting from %s to LRF is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:171
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:175
 msgid ""
 "any2lrf [options] myfile\n"
 "\n"
@@ -693,118 +833,118 @@ msgid ""
 "    "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:186
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/any/convert_from.py:190
 msgid "No file to convert specified."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:218
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
 msgid "Rendered %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:221
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:224
 msgid "Failed %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:273
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:276
 msgid ""
 "Failed to process comic: %s\n"
 "\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:280
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:283
 msgid ""
 "Options to control the conversion of comics (CBR, CBZ) files into ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:286
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:289
 msgid "Title for generated ebook. Default is to use the filename."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:288
-msgid ""
-"Set the author in the metadata of the generated ebook. Default is %default"
-msgstr ""
-
 #: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:291
 msgid ""
+"Set the author in the metadata of the generated ebook. Default is %default"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:294
+msgid ""
 "Path to output file. By default a file is created in the current directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:293
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:296
 msgid "Number of colors for grayscale image conversion. Default: %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:295
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:298
 msgid ""
 "Disable normalize (improve contrast) color range for pictures. Default: False"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:297
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:300
 msgid "Maintain picture aspect ratio. Default is to fill the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:299
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:302
 msgid "Disable sharpening."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:301
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:304
 msgid "Don't split landscape images into two portrait images"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:303
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:306
 msgid ""
 "Keep aspect ratio and scale image using screen height as image width for "
 "viewing in landscape mode."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:305
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:308
 msgid ""
 "Used for right-to-left publications like manga. Causes landscape pages to be "
 "split into portrait pages from right to left."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:307
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:310
 msgid ""
 "Enable Despeckle. Reduces speckle noise. May greatly increase processing "
 "time."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:309
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:312
 msgid ""
 "Don't sort the files found in the comic alphabetically by name. Instead use "
 "the order they were added to the comic."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:311
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:314
 msgid ""
 "Choose a profile for the device you are generating this file for. The "
 "default is the SONY PRS-500 with a screen size of 584x754 pixels. This is "
 "suitable for any reader with the same screen size. Choices are %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:313
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:316
 msgid ""
 "Be verbose, useful for debugging. Can be specified multiple times for "
 "greater verbosity."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:315
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:318
 msgid "Don't show progress bar."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:320
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:323
 msgid ""
 "%prog [options] comic.cb[z|r]\n"
 "\n"
 "Convert a comic in a CBZ or CBR file to an ebook. \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:380
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:383
 msgid "Output written to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:421
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/comic/convert_from.py:426
 msgid "Rendering comic pages..."
 msgstr ""
 
@@ -845,95 +985,95 @@ msgstr ""
 msgid "Fetching of recipe failed: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:316
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
 msgid "\tBook Designer file detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:318
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:320
 msgid "\tParsing HTML..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:340
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:343
 msgid "\tBaen file detected. Re-parsing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:356
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:359
 msgid "Written preprocessed HTML to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:374
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:377
 msgid "Processing %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:388
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:391
 msgid "\tConverting to BBeB..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:532
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:545
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:550
 msgid "Could not parse file: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:537
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:542
 msgid "%s is an empty file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:557
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:562
 msgid "Failed to parse link %s %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:601
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:606
 msgid "Cannot add link %s to TOC"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:953
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:958
 msgid "Unable to process image %s. Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:991
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:996
 msgid "Unable to process interlaced PNG %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1006
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1011
 msgid ""
 "Could not process image: %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1761
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1768
 msgid ""
 "An error occurred while processing a table: %s. Ignoring table markup."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1763
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1770
 msgid ""
 "Bad table:\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1785
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1792
 msgid "Table has cell that is too large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1815
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1822
 msgid ""
 "You have to save the website %s as an html file first and then run html2lrf "
 "on it."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1858
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1865
 msgid "Could not read cover image: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1861
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1868
 msgid "Cannot read from: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:1996
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2003
 msgid "Failed to process opf file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2002
+#: /home/kovid/work/calibre/src/calibre/ebooks/lrf/html/convert_from.py:2009
 msgid ""
 "Usage: %prog [options] mybook.html\n"
 "\n"
@@ -1132,17 +1272,17 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:69
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:70
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:36
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:91
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:311
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:326
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:905
 msgid "Title"
 msgstr "ą°¶ą±€ą°°ą±ą°·ą°æą°•"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:274
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/fetch_metadata.py:37
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:316
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:331
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:906
 msgid "Author(s)"
 msgstr "ą°°ą°šą°Æą°æą°¤(ą°²ą±)"
 
@@ -1161,25 +1301,25 @@ msgstr "ą°µą°°ą±ą°—ą°‚"
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:391
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:527
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:308
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:272
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:58
 msgid "Comments"
 msgstr "ą°µą±ą°Æą°¾ą°–ą±ą°Æą°²ą±"
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:280
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:97
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:261
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:798
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:862
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:276
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:909
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Tags"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/__init__.py:281
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:98
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:55
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Series"
 msgstr ""
@@ -1188,23 +1328,23 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:194
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:199
 msgid "A comma separated list of tags to set"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:196
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:201
 msgid "The series to which this book belongs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:198
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:203
 msgid "The series index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:200
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:205
 msgid "The book language"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:202
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/epub.py:207
 msgid "Extract the cover"
 msgstr ""
 
@@ -1283,7 +1423,7 @@ msgstr ""
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:939
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:938
 msgid "Set the dc:language field"
 msgstr ""
 
@@ -1295,11 +1435,11 @@ msgstr ""
 msgid "Usage: rb-meta file.rb"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:439
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:442
 msgid "%prog [options] myebook.mobi"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:463
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:466
 msgid "Raw MOBI HTML saved in"
 msgstr ""
 
@@ -1308,7 +1448,7 @@ msgid "The output directory. Defaults to the current directory."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:25
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:357
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:424
 msgid "Frequently used directories"
 msgstr ""
 
@@ -1376,6 +1516,18 @@ msgstr ""
 msgid "Oldest news kept in database"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:56
+msgid "Show system tray icon"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:57
+msgid "Upload downloaded news to device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/__init__.py:58
+msgid "Delete books from library after uploading to device"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/device.py:72
 msgid "Device no longer connected."
 msgstr ""
@@ -1411,9 +1563,9 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:84
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:85
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:86
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:268
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:793
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:52
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:840
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:56
 msgid "Path"
 msgstr ""
 
@@ -1421,8 +1573,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:88
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:89
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info.py:92
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:267
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
 #: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
 msgid "Formats"
 msgstr ""
@@ -1436,6 +1588,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/book_info_ui.py:63
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/choose_format_ui.py:41
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:49
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:56
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/warning_ui.py:53
 msgid "TextLabel"
@@ -1511,83 +1664,144 @@ msgstr ""
 msgid "&Wide"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:27
-msgid "General"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:100
+msgid " plugins"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:28
-msgid "Interface"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:106
+msgid "by"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:29
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
 msgid "Advanced"
 msgstr "ą°‰ą°Øą±ą°Øą°¤"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:30
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "General"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:123
+msgid "Interface"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
 msgid ""
 "Content\n"
 "Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:124
+msgid "Plugins"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:255
+msgid "No valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:256
+msgid "%s is not a valid plugin path"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:259
+msgid "Choose plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:270
+msgid "Plugin cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:271
+msgid "The plugin: %s cannot be disabled"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:281
+msgid "Plugin not customizable"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:282
+msgid "Plugin: %s does not need customization"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:285
+msgid "Customize %s"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:295
+msgid "Cannot remove builtin plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:296
+msgid " cannot be removed. It is a builtin plugin. Try disabling it instead."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:317
 msgid "Error log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:321
 msgid "Access log:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:165
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:319
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:382
 msgid "Failed to start content server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:237
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:241
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "Invalid size"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:383
+msgid "The size %s is invalid. must be of the form widthxheight"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:423
 msgid "Invalid database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "<br>Must be a directory."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:238
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:420
 msgid "Invalid database location "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:242
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:424
 msgid "Invalid database location.<br>Cannot write to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting database. This may take a while."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:436
 msgid "Compacting..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:339
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:286
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:408
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:329
 msgid "Configuration"
 msgstr "ą°øą±ą°µą°°ą±‚ą°Ŗą°£ą°‚"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:340
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:409
 msgid ""
 "&Location of ebooks (The ebooks are stored in folders sorted by author and "
 "metadata is stored in the file metadata.db)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:341
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:410
 msgid "Browse for the new database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:342
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:359
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:361
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:372
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:411
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:426
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:428
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:438
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:439
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:467
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:509
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:282
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:288
@@ -1603,189 +1817,202 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:233
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:235
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:236
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:279
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:285
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:287
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:322
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:328
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:330
 msgid "..."
 msgstr "..."
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:343
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:412
 msgid "Show notification when &new version is available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:344
-msgid "Ask for &confirmation before deleting files"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:345
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:413
 msgid ""
-"If you disable this setting, metadatas is guessed from the filename instead. "
+"If you disable this setting, metadata is guessed from the filename instead. "
 "This can be configured in the Advanced section."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:346
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:414
 msgid "Read &metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:347
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:415
 msgid "Format for &single file save:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:348
-msgid "&Priority for conversion jobs:"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:349
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:416
 msgid "Default network &timeout:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:350
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:417
 msgid ""
 "Set the default timeout for network fetches (i.e. anytime we go out to the "
 "internet to get information)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:351
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:418
 msgid " seconds"
 msgstr " ą°•ą±ą°·ą°£ą°¾ą°²ą±"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:352
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:419
 msgid "Choose &language (requires restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:353
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:536
-msgid "The default output format for ebook conversions."
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:420
+msgid "Normal"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:354
-msgid "LRF"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:421
+msgid "High"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:355
-msgid "EPUB"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:422
+msgid "Low"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:356
-msgid "&Output format:"
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:423
+msgid "Job &priority:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:358
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:425
 msgid "Add a directory to the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:360
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:427
 msgid "Remove a directory from the frequently used directories list"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:362
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:429
 msgid "Use &Roman numerals for series number"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:363
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:430
 msgid "&Number of covers to show in browse mode (after restart):"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:364
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:431
 msgid "Toolbar"
 msgstr "ą°Ŗą°Øą°æą°®ą±ą°Ÿą±ą°² ą°Ŗą°Ÿą±ą°Ÿą±€"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:365
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:432
 msgid "Large"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:366
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:433
 msgid "Medium"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:367
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:434
 msgid "Small"
 msgstr "ą°šą°æą°Øą±ą°Ø"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:435
 msgid "&Button size in toolbar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:436
 msgid "Show &text in toolbar buttons"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:370
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:437
 msgid "Select visible &columns in library view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:440
 msgid "Use internal &viewer for the following formats:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:441
+msgid "Enable system &tray icon (needs restart)"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:442
+msgid "Automatically send downloaded &news to ebook reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:443
+msgid "&Delete news from library when it is sent to reader"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:444
 msgid "Free unused diskspace from the database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:375
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:445
 msgid "&Compact database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:376
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:446
 msgid "&Metadata from file name"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:377
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:447
 msgid ""
 "calibre contains a network server that allows you to access your book "
 "collection using a browser from anywhere in the world. Any changes to the "
 "settings will only take effect after a server restart."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:378
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:448
 msgid "Server &port:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:379
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:449
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
 msgid "&Username:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:380
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:450
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:58
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:147
 msgid "&Password:"
 msgstr "&ą°øą°‚ą°•ą±‡ą°¤ą°Ŗą°¦ą°‚:"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:381
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:451
 msgid ""
 "If you leave the password blank, anyone will be able to access your book "
 "collection using the web interface."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:382
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:452
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/password_ui.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:148
 msgid "&Show password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:383
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:453
+msgid ""
+"The maximum size (widthxheight) for displayed covers. Larger covers are "
+"resized. "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:454
+msgid "Max. &cover size:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:455
 msgid "&Start Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:384
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:456
 msgid "St&op Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:385
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:457
 msgid "&Test Server"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:386
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:458
 msgid "Run server &automatically on startup"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:387
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:459
 msgid "View &server logs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:388
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:460
 msgid ""
 "If you want to use the content server to access your ebook collection on "
 "your iphone with Stanza, you will need to add the URL "
@@ -1794,6 +2021,44 @@ msgid ""
 "address of this computer."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:461
+msgid ""
+"Here you can customize the behavior of Calibre by controlling what plugins "
+"it uses."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:462
+msgid "Enable/&Disable plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:463
+msgid "&Customize plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:464
+msgid "&Remove plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:465
+msgid "Add new plugin"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:466
+msgid "Plugin &file:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:468
+msgid "&Add"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:48
+msgid "Are you sure?"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/confirm_delete_ui.py:50
+msgid "&Show this warning again"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/conversion_error_ui.py:41
 msgid "ERROR"
 msgstr "ą°Ŗą±Šą°°ą°Ŗą°¾ą°Ÿą±"
@@ -1811,7 +2076,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:55
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:296
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:143
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
 msgid "Metadata"
 msgstr ""
 
@@ -1865,25 +2130,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:100
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:174
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:50
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
 msgid "Cannot read"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:101
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:175
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:51
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:52
 msgid "You do not have permission to read the file: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:109
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:183
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:59
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
 msgid "Error reading file"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:110
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:60
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:61
 msgid "<p>There was an error reading from file: <br /><b>"
 msgstr ""
 
@@ -1893,7 +2158,7 @@ msgid " is not a valid picture"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub.py:227
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "Cannot convert"
 msgstr ""
 
@@ -1934,22 +2199,22 @@ msgid "Book Cover"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:371
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
-msgid "Use cover from &source file"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:507
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:316
 msgid "Change &cover image:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:373
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:372
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:508
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:317
 msgid "Browse for an image to use as the cover of this book."
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:374
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:510
+msgid "Use cover from &source file"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:375
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:511
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:279
@@ -1964,14 +2229,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:377
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:513
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:124
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:283
 msgid "&Author(s): "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:378
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:514
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:125
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:284
 msgid ""
 "Change the author(s) of this book. Multiple authors should be separated by "
@@ -1992,14 +2257,14 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:381
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:517
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:293
 msgid "&Publisher: "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:382
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:294
 msgid "Change the publisher of this book"
 msgstr ""
@@ -2012,7 +2277,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:384
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:520
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:296
 msgid ""
 "Tags categorize the book. This is particularly useful while searching. "
@@ -2021,7 +2286,7 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:385
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:521
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:144
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:299
 msgid "&Series:"
 msgstr ""
@@ -2030,8 +2295,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/epub_ui.py:387
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:522
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/lrf_single_ui.py:523
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:146
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:300
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:301
 msgid "List of known series. You can add new series."
@@ -2444,91 +2709,95 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
-"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
-"family:'Sans Serif'; font-size:9pt;\"></p></body></html>"
+"margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
+"indent:0px;\"></p></body></html>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:122
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
 msgid "Edit Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:123
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:278
 msgid "Meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:126
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:285
 msgid "Author S&ort: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:127
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:286
 msgid ""
 "Specify how the author(s) of this book should be sorted. For example Charles "
 "Dickens should be sorted as Dickens, Charles."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:128
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:132
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:289
 msgid "&Rating:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:129
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:290
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:291
 msgid "Rating of this book. 0-5 stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:131
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:135
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:292
 msgid " stars"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
 msgid "Add Ta&gs: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:140
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:141
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:297
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single_ui.py:298
 msgid "Open Tag Editor"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:142
 msgid "&Remove tags:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:139
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
 msgid "Comma separated list of tags to remove from the books. "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:147
 msgid "Remove &format:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:261
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_bulk_ui.py:148
+msgid "A&utomatically set author sort"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:262
 msgid ""
 "<p>Enter your username and password for <b>LibraryThing.com</b>. <br/>If you "
 "do not have one, you can <a href='http://www.librarything.com'>register</a> "
 "for free!.</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "<b>Could not fetch cover.</b><br/>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:292
 msgid "Could not fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "Cannot fetch cover"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/metadata_single.py:298
 msgid "You must specify the ISBN identifier for this book."
 msgstr ""
 
@@ -2590,93 +2859,112 @@ msgstr "ą°øą°‚ą°•ą±‡ą°¤ą°Ŗą°¦ą°‚ ą°®ą°¾ą°°ą±ą°šą±"
 msgid "Password needed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:39
+msgid "You"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:169
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:218
 msgid "Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:234
+msgid "%d recipes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "Must set account information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:259
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:263
 msgid "This recipe requires a username and password"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:276
+msgid "Created by: "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:296
 msgid "Last downloaded: %s days ago"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:293
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:298
 msgid "Last downloaded: never"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:320
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:130
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:325
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
 msgid "Schedule news download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:323
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:328
 msgid "Add a custom news source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:330
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:854
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:335
+#: /home/kovid/work/calibre/src/calibre/gui2/tags.py:42
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:752
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:756
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1055
 msgid "News"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:131
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Recipes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:132
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
 msgid "Schedule for download"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:133
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:139
 msgid "title"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:134
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:140
 msgid "description"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:135
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:141
+msgid "author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
 msgid "&Schedule for download every:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:136
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
 msgid ""
 "Interval at which to download this recipe. A value of zero means that the "
 "recipe will be downloaded every hour."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:137
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:152
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles_ui.py:229
 msgid " days"
 msgstr " ą°°ą±‹ą°œą±ą°²ą±"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:138
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:145
 msgid "&Account"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:149
 msgid "For the scheduling to work, you must leave calibre running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:143
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:150
 msgid "&Download now"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:151
 msgid ""
 "Delete downloaded news older than the specified number of days. Set to zero "
 "to disable."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler_ui.py:153
 msgid "Delete downloaded news older than "
 msgstr ""
 
@@ -2826,25 +3114,25 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:163
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:172
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:228
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
 msgid "Invalid input"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:164
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:173
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:230
 msgid "<p>Could not create recipe. Error:<br>%s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:210
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:234
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
 msgid "Replace recipe?"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:180
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:211
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:235
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:236
 msgid "A custom recipe named %s already exists. Do you want to replace it?"
 msgstr ""
 
@@ -2856,7 +3144,7 @@ msgstr ""
 msgid "Pick the recipe to customize"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:221
+#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/user_profiles.py:222
 msgid "Choose a recipe file"
 msgstr ""
 
@@ -3086,52 +3374,62 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:162
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:166
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:172
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:176
 msgid "Cannot kill job"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:173
 msgid "Cannot kill jobs that communicate with the device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/jobs2.py:177
 msgid "Job has already run"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:93
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:860
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:907
 msgid "Size (MB)"
 msgstr "ą°Ŗą°°ą°æą°®ą°¾ą°£ą°‚ (ą°®ą±†ą°¬ą±ˆ)"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:94
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:861
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:908
 msgid "Date"
 msgstr "ą°¤ą±‡ą°¦ą±€"
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:95
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:96
 msgid "Rating"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:260
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:266
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:271
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:275
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:286
 msgid "None"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:292
 msgid "Book <font face=\"serif\">%s</font> of %s."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:792
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:675
+msgid "Not allowed"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:676
+msgid ""
+"Dropping onto a device is not supported. First add the book to the calibre "
+"library."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:839
 msgid "Format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:797
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:844
 msgid "Timestamp"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/library.py:895
+#: /home/kovid/work/calibre/src/calibre/gui2/library.py:942
 msgid "Search (For Advanced Search click the button to the left)"
 msgstr ""
 
@@ -3160,7 +3458,7 @@ msgid "<b>No matches</b> for the search phrase <i>%s</i> were found."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main.py:157
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:368
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:377
 msgid "No matches found"
 msgstr ""
 
@@ -3185,12 +3483,12 @@ msgid "Previous Page"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:133
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:148
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
 msgid "Back"
 msgstr "ą°µą±†ą°Øą±ą°•ą°•ą±"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:134
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:149
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:155
 msgid "Forward"
 msgstr "ą°®ą±ą°‚ą°¦ą±ą°•ą°æ"
 
@@ -3199,7 +3497,7 @@ msgid "Next match"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/lrf_renderer/main_ui.py:136
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:162
 msgid "Open ebook"
 msgstr ""
 
@@ -3207,144 +3505,152 @@ msgstr ""
 msgid "Configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:87
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:88
 msgid "Error communicating with device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:99
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
 msgid "&Restore"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:100
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
 msgid "&Donate"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:102
 msgid "&Quit"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:120
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:104
+msgid "&Restart"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:148
 msgid ""
 "<p>For help visit <a "
 "href=\"http://%s.kovidgoyal.net/user_manual\">%s.kovidgoyal.net</a><br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:121
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:149
 msgid "<b>%s</b>: %s by <b>Kovid Goyal %%(version)s</b><br>%%(device)s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:139
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:167
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
 msgid "Send to main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:140
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:168
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "Send to storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:141
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:142
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:169
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:170
 msgid "and delete from library"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:172
 msgid "Send to storage card by default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
 msgid "Edit metadata individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:187
 msgid "Edit metadata in bulk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:162
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:190
 msgid "Add books from a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:163
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:191
 msgid ""
-"Add books recursively (One book per directory, assumes every ebook file is "
-"the same book in a different format)"
+"Add books from directories, including sub-directories (One book per "
+"directory, assumes every ebook file is the same book in a different format)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:164
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:192
 msgid ""
-"Add books recursively (Multiple books per directory, assumes every ebook "
-"file is a different book)"
+"Add books from directories, including sub directories (Multiple books per "
+"directory, assumes every ebook file is a different book)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:179
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:299
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:207
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:342
 msgid "Save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:208
 msgid "Save to disk in a single directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:181
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1053
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:209
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1200
 msgid "Save only %s format to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:184
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:305
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:212
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:348
 msgid "View"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:213
 msgid "View specific format"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:198
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:230
 msgid "Convert individually"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:199
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:231
 msgid "Bulk convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:201
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:233
 msgid "Set defaults for conversion"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:202
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:234
 msgid "Set defaults for conversion of comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:240
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:255
+msgid "Similar books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:301
 msgid "Bad database location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:242
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1207
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:254
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:315
 msgid "Migrating database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:396
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:487
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:397
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:488
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:419
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:510
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:430
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:521
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:431
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:522
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the "
@@ -3360,383 +3666,448 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:482
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:571
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+msgid "Stop"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:574
+msgid "Adding books recursively..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Added "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:578
+msgid "Searching..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:589
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:695
 msgid ""
 "<p>Books with the same title as the following already exist in the database. "
 "Add them anyway?<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:485
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:587
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:592
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:698
 msgid "Duplicates found!"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:518
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:542
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:625
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:649
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:526
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:633
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:527
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:634
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:528
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:635
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:529
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:636
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:530
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:637
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:531
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:638
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:532
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:639
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:533
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:640
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:641
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:642
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:619
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:658
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:661
+msgid "Reading metadata..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:659
+msgid "Adding books..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:685
+msgid "Read metadata from "
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:688
+msgid "Adding books to database..."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:730
 msgid "No space on device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:620
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:731
 msgid ""
 "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:651
-msgid "Confirm delete"
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:763
+msgid ""
+"The selected books will be <b>permanently deleted</b> and the files removed "
+"from your computer. Are you sure?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:652
-msgid "Are you sure you want to delete these %d books?"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:664
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:772
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:694
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:716
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:867
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:802
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1002
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:790
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:871
+msgid "Sending news to device."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:923
 msgid "Sending books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:793
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:926
 msgid "No suitable formats"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:794
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:927
 msgid ""
 "Could not upload the following books to the device, as no suitable formats "
 "were found:<br><ul>%s</ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:810
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:943
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:814
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:821
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:954
 msgid ""
 "<p>Could not save the following books to disk, because the %s format is not "
 "available for them:<ul>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Could not save some ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:845
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:858
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:992
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:971
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:989
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1005
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1106
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1136
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1152
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:977
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1010
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1112
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1157
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1006
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1124
+msgid "Cannot open folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1153
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1044
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1191
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1063
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1210
 msgid "Copying database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1065
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1212
 msgid "Copying library to "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1222
 msgid "Invalid database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1223
 msgid ""
 "<p>An invalid database already exists at %s, delete it before trying to move "
 "the existing database.<br>Error: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1229
 msgid "Could not move database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1249
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1103
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1250
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1144
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1293
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1145
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1294
 msgid ""
 "There was a temporary error talking to the device. Please unplug and "
 "reconnect the device and or reboot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1158
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1173
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1177
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1307
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1322
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1326
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1159
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1308
 msgid ""
 "<p>Could not convert: %s<p>It is a <a href=\"%s\">DRM</a>ed book. You must "
 "first remove the DRM using 3rd party tools."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1193
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1342
 msgid "Database does not exist"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1194
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1343
 msgid ""
 "The directory in which the database should be: %s no longer exists. Please "
 "choose a new database location."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1196
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1345
 msgid "Choose new location for database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1248
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1398
 msgid ""
 "is the result of the efforts of many volunteers from all over the world. If "
 "you find it useful, please consider donating to support its development."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1268
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1419
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1270
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1421
 msgid ""
 " is communicating with the device!<br>\n"
 "                  'Quitting may cause corruption on the device.<br>\n"
 "                  'Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1274
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1425
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1303
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1454
 msgid ""
 "will keep running in the system tray. To close it, choose <b>Quit</b> in the "
 "context menu of the system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1316
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1467
 msgid ""
 "<span style=\"color:red; font-weight:bold\">Latest version: <a "
 "href=\"%s\">%s</a></span>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid ""
 "%s has been updated to version %s. See the <a "
 "href=\"http://calibre.kovidgoyal.net/wiki/Changelog\">new features</a>. "
 "Visit the download page?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1321
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1472
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1336
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1338
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1489
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1340
-msgid "Disable system tray icon"
-msgstr ""
-
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:277
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:319
 msgid "calibre"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:278
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:320
+msgid "Output:"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:321
 msgid "Advanced search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:280
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:323
 msgid "Alt+S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:281
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:324
 msgid "&Search:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:282
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:325
 msgid ""
 "Search the list of books by title or author<br><br>Words separated by spaces "
 "are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:283
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:326
 msgid ""
 "Search the list of books by title, author, publisher, tags and "
 "comments<br><br>Words separated by spaces are ANDed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:284
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:327
 msgid "Reset Quick Search"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:288
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:331
 msgid "Match any"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:289
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:332
 msgid "Match all"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:290
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:333
 msgid "Sort by &popularity"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:291
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:334
 msgid "Add books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:292
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:335
 msgid "A"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:293
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:294
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:336
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:337
 msgid "Remove books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:295
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:338
 msgid "Del"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:296
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:339
 msgid "Edit meta information"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:297
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:340
 msgid "E"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:298
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:341
 msgid "Send to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:300
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:343
 msgid "S"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:301
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:344
 msgid "Fetch news"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:302
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:345
 msgid "F"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:303
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:346
 msgid "Convert E-books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:304
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:347
 msgid "C"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:306
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:349
 msgid "V"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:350
+msgid "Open containing folder"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:351
+msgid "Show book details"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:352
+msgid "Books by same author"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:353
+msgid "Books in this series"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:354
+msgid "Books by this publisher"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/gui2/main_ui.py:355
+msgid "Books with the same tags"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/main_window.py:17
 msgid ""
 "Redirect console output to a dialog window (both stdout and stderr). Useful "
@@ -3747,29 +4118,29 @@ msgstr ""
 msgid "ERROR: Unhandled exception"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:108
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:115
 msgid "Jobs:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:117
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:124
 msgid "Click to see list of active jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to browse books by their covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:153
 msgid "Click to turn off Cover Browsing"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:158
 msgid ""
 "<p>Browsing books by their covers is disabled.<br>Import of pictureflow "
 "module failed:<br>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/status.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/status.py:166
 msgid "Click to browse books by tags"
 msgstr ""
 
@@ -3912,7 +4283,7 @@ msgid "The standard font type"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:47
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:154
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
 msgid "Table of Contents"
 msgstr ""
 
@@ -3936,109 +4307,113 @@ msgstr ""
 msgid "Search for text in book"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:329
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:338
 msgid "Choose ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:330
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:339
 msgid "Ebooks"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Add bookmark"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:348
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:357
 msgid "Enter title for bookmark:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:369
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:378
 msgid "No matches found for: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:409
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:418
 msgid "Loading flow..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:436
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:445
 msgid "Laying out %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:485
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:497
 msgid "Loading ebook..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "<p>This book is protected by <a href=\"%s\">DRM</a>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:493
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:505
 msgid "DRM Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:495
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:507
 msgid "Could not open ebook"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:496
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:508
 msgid "<b>%s</b><br/><p>%s</p>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:556
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:568
 msgid "Options to control the ebook viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:565
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:577
 msgid ""
 "%prog [options] file\n"
 "\n"
 "View an ebook.  \n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:146
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
 msgid "Ebook Viewer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:147
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
 msgid "toolBar"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:150
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:156
 msgid "Next page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:151
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
 msgid "Previous page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:152
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
 msgid "Font size larger"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:153
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
 msgid "Font size smaller"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:157
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:163
 msgid "Find next"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:158
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:164
 msgid "Copy to clipboard"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:159
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:165
 msgid "Preferences"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:160
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:166
 msgid "Reference Mode"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:161
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:167
 msgid "Bookmark"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
+msgid "Toggle full screen"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:47
 msgid "Invalid regular expression"
 msgstr ""
@@ -4047,31 +4422,36 @@ msgstr ""
 msgid "Invalid regular expression: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:178
-msgid "Library"
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:139
+msgid ""
+"Library\n"
+"%d\n"
+"books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:179
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:140
 msgid ""
 "Reader\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:180
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:141
 msgid ""
 "Card\n"
-"%s available"
+"%s\n"
+"available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:184
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:146
 msgid "Click to see the list of books available on your computer"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:185
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:147
 msgid "Click to see the list of books in the main memory of your reader"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:186
+#: /home/kovid/work/calibre/src/calibre/gui2/widgets.py:148
 msgid "Click to see the list of books on the storage card in your reader"
 msgstr ""
 
@@ -4099,6 +4479,10 @@ msgstr ""
 msgid "Username for access. By default, it is: %default"
 msgstr ""
 
+#: /home/kovid/work/calibre/src/calibre/library/__init__.py:32
+msgid "The maximum size for displayed covers"
+msgstr ""
+
 #: /home/kovid/work/calibre/src/calibre/library/cli.py:95
 msgid ""
 "Path to the calibre library. Default is to use the path stored in the "
@@ -4326,79 +4710,87 @@ msgid ""
 "For help on an individual command: %%prog command --help\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1098
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1146
 msgid "<p>Copying books to %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1111
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1223
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1159
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1268
 msgid "Copying <b>%s</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1194
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1239
 msgid "<p>Migrating old database to ebook library in %s<br><center>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/database2.py:1240
+#: /home/kovid/work/calibre/src/calibre/library/database2.py:1285
 msgid "Compacting database"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:137
+#: /home/kovid/work/calibre/src/calibre/library/server.py:139
 msgid "Password to access your calibre library. Username is "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/library/server.py:368
+#: /home/kovid/work/calibre/src/calibre/library/server.py:382
 msgid ""
 "[options]\n"
 "\n"
 "Start the calibre content server."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:364
+#: /home/kovid/work/calibre/src/calibre/parallel.py:367
 msgid "Could not launch worker process."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/parallel.py:784
+#: /home/kovid/work/calibre/src/calibre/parallel.py:791
 msgid "Job stopped by user"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:39
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:41
 msgid "%sUsage%s: %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:77
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:79
 msgid "Created by "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:524
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:527
 msgid "Path to the database in which books are stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:526
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:529
 msgid "Pattern to guess metadata from filenames"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:528
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:531
 msgid "Access key for isbndb.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:530
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:533
 msgid "Default timeout for network operations (seconds)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:532
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:535
 msgid "Path to directory in which your library of books is stored"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:534
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:537
 msgid "The language in which to display the user interface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/config.py:538
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:539
+msgid "The default output format for ebook conversions."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:541
 msgid "Read metadata from files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:169
+#: /home/kovid/work/calibre/src/calibre/utils/config.py:543
+msgid "The priority of worker processes"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/utils/fontconfig.py:172
 msgid "Could not initialize the fontconfig library"
 msgstr ""
 
@@ -4418,13 +4810,13 @@ msgstr ""
 msgid "Failed to authenticate with server: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:63
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:84
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:76
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:97
 msgid "Unknown feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:102
-#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:124
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:115
+#: /home/kovid/work/calibre/src/calibre/web/feeds/__init__.py:137
 msgid "Untitled article"
 msgstr ""
 
@@ -4437,28 +4829,28 @@ msgid "Customize the download engine"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:20
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:441
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:442
 msgid ""
 "Timeout in seconds to wait for a response from the server. Default: %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:22
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:449
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:450
 msgid ""
 "Minimum interval in seconds between consecutive fetches. Default is %default "
 "s"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:24
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:451
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:452
 msgid ""
 "The character encoding for the websites you are trying to download. The "
 "default is to try and guess the encoding."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:26
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:453
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:454
 msgid ""
 "Only links that match this regular expression will be followed. This option "
 "can be specified multiple times, in which case as long as a link matches any "
@@ -4466,7 +4858,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:28
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:455
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:456
 msgid ""
 "Any link that matches this regular expression will be ignored. This option "
 "can be specified multiple times, in which case as long as any regexp matches "
@@ -4476,7 +4868,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:30
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:457
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
 msgid "Do not download CSS stylesheets."
 msgstr ""
 
@@ -4573,114 +4965,114 @@ msgid "Dont show the progress bar"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/web/feeds/main.py:118
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:668
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:675
 msgid "Fetching feeds..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:34
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:41
 msgid "Unknown News Source"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:549
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:556
 msgid "Download finished"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:551
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:558
 msgid "Failed to download the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:553
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:559
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:560
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:566
 msgid " from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:557
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:564
 msgid "Failed to download parts of the following articles:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:561
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:568
 msgid "\tFailed links:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:647
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:654
 msgid "Could not fetch article. Run with --debug to see the reason"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:672
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:679
 msgid "Got feeds from index page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:678
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:685
 msgid "Trying to download cover..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:731
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:738
 msgid "Starting download [%d thread(s)]..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:747
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:754
 msgid "Feeds downloaded to %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:757
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:764
 msgid "Could not download cover: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:762
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:769
 msgid "Downloading cover from %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:802
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:898
 msgid "Untitled Article"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:857
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:953
 msgid ""
 "\n"
 "Downloaded article %s from %s\n"
 "%s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:863
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:959
 msgid "Article downloaded: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:869
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:965
 msgid "Failed to download article: %s from %s\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:874
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:970
 msgid "Article download failed: %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:889
+#: /home/kovid/work/calibre/src/calibre/web/feeds/news.py:985
 msgid "Fetching feed"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:435
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:436
 msgid ""
 "%prog URL\n"
 "\n"
 "Where URL is for example http://google.com"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:438
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:439
 msgid "Base directory into which URL is saved. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:444
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:445
 msgid ""
 "Maximum number of levels to recurse i.e. depth of links to follow. Default "
 "%default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:447
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:448
 msgid ""
 "The maximum number of files to download. This only applies to files from <a "
 "href> tags. Default is %default"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:458
+#: /home/kovid/work/calibre/src/calibre/web/fetch/simple.py:459
 msgid "Show detailed output information. Useful for debugging"
 msgstr ""
 
diff --git a/src/calibre/utils/config.py b/src/calibre/utils/config.py
index 1327fd415c..7f7e47b498 100644
--- a/src/calibre/utils/config.py
+++ b/src/calibre/utils/config.py
@@ -28,9 +28,11 @@ else:
     bdir = os.path.abspath(os.path.expanduser(os.environ.get('XDG_CONFIG_HOME', '~/.config')))
     config_dir = os.path.join(bdir, 'calibre')
 
+plugin_dir = os.path.join(config_dir, 'plugins')
+
 def make_config_dir():
-    if not os.path.exists(config_dir):
-        os.makedirs(config_dir, mode=448) # 0700 == 448
+    if not os.path.exists(plugin_dir):
+        os.makedirs(plugin_dir, mode=448) # 0700 == 448
 
 
 class CustomHelpFormatter(IndentedHelpFormatter):
@@ -78,6 +80,7 @@ class OptionParser(_OptionParser):
                  gui_mode=False,
                  conflict_handler='resolve',
                  **kwds):
+        usage = textwrap.dedent(usage)
         usage += '''\n\nWhenever you pass arguments to %prog that have spaces in them, '''\
                  '''enclose the arguments in quotation marks.'''
         _OptionParser.__init__(self, usage=usage, version=version, epilog=epilog, 
@@ -536,6 +539,8 @@ def _prefs():
               help=_('The default output format for ebook conversions.'))
     c.add_opt('read_file_metadata', default=True,
               help=_('Read metadata from files'))
+    c.add_opt('worker_process_priority', default='normal', 
+              help=_('The priority of worker processes'))
     
     c.add_opt('migrated', default=False, help='For Internal use. Don\'t modify.')
     return c
diff --git a/src/calibre/utils/fontconfig.py b/src/calibre/utils/fontconfig.py
index 9a6ba01992..8633cb3473 100644
--- a/src/calibre/utils/fontconfig.py
+++ b/src/calibre/utils/fontconfig.py
@@ -111,9 +111,12 @@ class FcValue(Structure):
                 ('u', _FcValue)
                 ]
 
+class FcObjectSet(Structure): pass
+    
 lib = load_library()
+lib.FcPatternBuild.restype = POINTER(FcPattern)
 lib.FcPatternCreate.restype   = c_void_p
-lib.FcObjectSetCreate.restype = c_void_p
+lib.FcObjectSetCreate.restype = POINTER(FcObjectSet)
 lib.FcFontSetDestroy.argtypes = [POINTER(FcFontSet)]
 lib.FcFontList.restype = POINTER(FcFontSet)
 lib.FcNameUnparse.argtypes = [POINTER(FcPattern)]
@@ -238,7 +241,7 @@ def files_for_family(family, normalize=True):
     join()
     if isinstance(family, unicode):
         family = family.encode(preferred_encoding)
-    family_pattern = lib.FcPatternBuild(0, 'family', FcTypeString, family, 0)
+    family_pattern = lib.FcPatternBuild(0, 'family', FcTypeString, family, None)
     if not family_pattern:
         raise RuntimeError('Allocation failure')
     #lib.FcPatternPrint(family_pattern)
@@ -256,8 +259,8 @@ def files_for_family(family, normalize=True):
     fonts = {}
     fs = lib.FcFontList(0, family_pattern, oset)
     font_set = fs.contents
-    file  = pointer(create_string_buffer(chr(0), 5000))
-    full_name  = pointer(create_string_buffer(chr(0), 200))
+    file  = pointer(create_string_buffer(5000))
+    full_name  = pointer(create_string_buffer(200))
     weight = c_int(0)
     slant = c_int(0)
     fname = ''
diff --git a/src/calibre/utils/lzx/compressor.c b/src/calibre/utils/lzx/compressor.c
new file mode 100644
index 0000000000..1c496a5c27
--- /dev/null
+++ b/src/calibre/utils/lzx/compressor.c
@@ -0,0 +1,375 @@
+/* __license__   = 'GPL v3'
+ * __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+ *
+ * Python/C implementation of an LZX compressor type.
+ */
+
+#include <Python.h>
+#include <structmember.h>
+#include <lzxc.h>
+#include <lzxmodule.h>
+
+#define BUFFER_INIT(buffer)                                             \
+    do {                                                                \
+        (buffer).data = NULL;                                           \
+        (buffer).size = 0;                                              \
+        (buffer).offset = 0;                                            \
+    } while (0)
+
+#define COMPRESSOR_REMAINING(compressor)                                \
+    (((compressor)->residue.size - (compressor)->residue.offset)        \
+     + ((compressor)->input.size - (compressor)->input.offset))
+
+typedef struct buffer_t {
+    char *data;
+    unsigned int size;
+    unsigned int offset;
+} buffer_t;
+
+typedef struct Compressor {
+    PyObject_HEAD
+    int reset;
+    int wbits;
+    int blocksize;
+    int flushing;
+    struct lzxc_data *stream;
+    buffer_t residue;
+    buffer_t input;
+    buffer_t output;
+    PyObject *rtable;
+} Compressor;
+
+static PyMemberDef Compressor_members[] = {
+    { "reset", T_INT, offsetof(Compressor, reset), READONLY,
+      "whether or not the Compressor resets each block" },
+    { "wbits", T_INT, offsetof(Compressor, wbits), READONLY,
+      "window size in bits" },
+    { "blocksize", T_INT, offsetof(Compressor, blocksize), READONLY,
+      "block size in bytes" },
+    { NULL }
+};
+
+static int
+Compressor_traverse(Compressor *self, visitproc visit, void *arg)
+{
+    Py_VISIT(self->rtable);
+    return 0;
+}
+
+static int
+Compressor_clear(Compressor *self)
+{
+    Py_CLEAR(self->rtable);
+    return 0;
+}
+
+static void
+Compressor_dealloc(Compressor *self)
+{
+    Compressor_clear(self);
+    
+    if (self->stream) {
+        lzxc_finish(self->stream, NULL);
+        self->stream = NULL;
+    }
+    if (self->residue.data) {
+        PyMem_Free(self->residue.data);
+        self->residue.data = NULL;
+    }
+    if (self->output.data) {
+        PyMem_Free(self->output.data);
+        self->output.data = NULL;
+    }
+
+    self->ob_type->tp_free((PyObject *)self);
+}
+
+static PyObject *
+Compressor_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    Compressor *self = NULL;
+
+    self = (Compressor *)type->tp_alloc(type, 0);
+    if (self != NULL) {
+        self->rtable = PyList_New(0);
+        if (self->rtable == NULL) {
+            Py_DECREF(self);
+            return NULL;
+        }
+        self->wbits = 0;
+        self->blocksize = 0;
+        self->flushing = 0;
+        
+        BUFFER_INIT(self->residue);
+        BUFFER_INIT(self->input);
+        BUFFER_INIT(self->output);
+    }
+    
+    return (PyObject *)self;
+}
+
+static int
+get_bytes(void *context, int nbytes, void *buf) 
+{
+    Compressor *self = (Compressor *)context;
+    unsigned char *data = (unsigned char *)buf;
+    buffer_t *residue = &self->residue;
+    buffer_t *input = &self->input;
+    int resrem = residue->size - residue->offset;
+    int inrem = input->size - input->offset;
+
+    if (resrem > 0) {
+        if (resrem <= nbytes) {
+            memcpy(data, residue->data + residue->offset, nbytes);
+            residue->offset += nbytes;
+            return nbytes;
+        } else {
+            memcpy(data, residue->data + residue->offset, resrem);
+            residue->offset += resrem;
+            data += resrem;
+            nbytes -= resrem;
+        }
+    }
+    
+    if (inrem == 0) {
+        return resrem;
+    } else if (nbytes > inrem) {
+        nbytes = inrem;
+    }
+    memcpy(data, input->data + input->offset, nbytes);
+    input->offset += nbytes;
+
+    return nbytes + resrem;
+}
+
+static int
+at_eof(void *context) 
+{
+    Compressor *self = (Compressor *)context;
+    return (self->flushing && (COMPRESSOR_REMAINING(self) == 0));
+}
+
+static int
+put_bytes(void *context, int nbytes, void *data)
+{
+    Compressor *self = (Compressor *)context;
+    buffer_t *output = &self->output;
+    int remaining = output->size - output->offset;
+
+    if (nbytes > remaining) {
+        PyErr_SetString(LZXError,
+            "Attempt to write compressed data beyond end of buffer");
+        nbytes = remaining;
+    }
+
+    memcpy(output->data + output->offset, data, nbytes);
+    output->offset += nbytes;
+
+    return nbytes;
+}
+
+static void
+mark_frame(void *context, uint32_t uncomp, uint32_t comp)
+{
+    Compressor *self = (Compressor *)context;
+    PyObject *rtable = self->rtable;
+    PyObject *entry = NULL;
+
+    entry = Py_BuildValue("(II)", uncomp, comp);
+    if (entry) {
+        PyList_Append(rtable, entry);
+        Py_DECREF(entry);
+    }
+}
+
+static int
+Compressor_init(Compressor *self, PyObject *args, PyObject *kwds)
+{
+    static char *kwlist[] = {"wbits", "reset", NULL};
+    int wbits = 0;
+    int retval = 0;
+
+    self->reset = 1;
+    
+    if (!PyArg_ParseTupleAndKeywords(
+            args, kwds, "I|b", kwlist, &wbits, &self->reset)) {
+        return -1; 
+    }
+    /* TODO: check window size. */
+
+    self->wbits = wbits;
+    self->blocksize = 1 << wbits;
+
+    self->residue.data = PyMem_Realloc(self->residue.data, self->blocksize);
+    if (self->residue.data == NULL) {
+        PyErr_NoMemory();
+        return -1;
+    }
+
+    if (self->stream != NULL) {
+        lzxc_finish(self->stream, NULL);
+    }
+    retval = lzxc_init(&self->stream, wbits, get_bytes, self, at_eof,
+                       put_bytes, self, mark_frame, self);
+    if (retval != 0) {
+        self->stream = NULL;
+        PyErr_SetString(LZXError, "Failed to create compression stream");
+        return -1;
+    }
+    
+    return 0;
+}
+
+static PyObject *
+Compressor_compress__(
+    Compressor *self, char *data, unsigned int inlen, int flush)
+{
+    buffer_t *residue = &self->residue;
+    buffer_t *input = &self->input;
+    buffer_t *output = &self->output;
+    unsigned int outlen, remainder;
+    int reset = self->reset;
+    unsigned int blocksize = self->blocksize;
+    int retval = 0;
+    PyObject *cdata = NULL;
+    PyObject *rtable = NULL;
+    PyObject *result = NULL;
+    
+    self->flushing = flush;
+    input->data = data;
+    input->size = inlen;
+    input->offset = 0;
+    
+    outlen = inlen;
+    remainder = outlen % blocksize;
+    if (remainder != 0) {
+        outlen += (blocksize - remainder) + 1;
+    }
+    if (output->size < outlen) {
+        output->data = PyMem_Realloc(output->data, outlen);
+        if (output->data == NULL) {
+            return PyErr_NoMemory();
+        }
+        output->size = outlen;
+    }
+    output->offset = 0;
+
+    while (COMPRESSOR_REMAINING(self) >= blocksize) {
+        retval = lzxc_compress_block(self->stream, blocksize, 1);
+        if (retval != 0) {
+            PyErr_SetString(LZXError, "Error during compression");
+            return NULL;
+        }
+        if (reset) {
+            lzxc_reset(self->stream);
+        }
+    }
+    if (flush && COMPRESSOR_REMAINING(self) > 0) {
+        retval = lzxc_compress_block(self->stream, blocksize, 1);
+        if (retval != 0) {
+            PyErr_SetString(LZXError, "Error during compression");
+            return NULL;
+        }
+        if (reset) {
+            lzxc_reset(self->stream);
+        }
+        residue->size = 0;
+        residue->offset = 0;
+    } else {
+        int reslen = input->size - input->offset;
+        memcpy(residue->data, input->data + input->offset, reslen);
+        residue->size = reslen;
+        residue->offset = 0;
+    }
+
+    rtable = self->rtable;
+    self->rtable = PyList_New(0);
+    if (self->rtable == NULL) {
+        self->rtable = rtable;
+        return NULL;
+    }
+    cdata = PyString_FromStringAndSize(output->data, output->offset);
+    if (cdata == NULL) {
+        Py_DECREF(rtable);
+        return NULL;
+    }
+
+    result = Py_BuildValue("(OO)", cdata, rtable);
+    Py_DECREF(rtable);
+    Py_DECREF(cdata);
+
+    return result;
+}
+
+static PyObject *
+Compressor_compress(Compressor *self, PyObject *args, PyObject *kwds)
+{
+    static char *kwlist[] = {"data", "flush", NULL};
+    char *data = NULL;
+    unsigned int inlen = 0;
+    int flush = 0;
+
+    if (!PyArg_ParseTupleAndKeywords(
+            args, kwds, "s#|b", kwlist, &data, &inlen, &flush)) {
+        return NULL;
+    }
+
+    return Compressor_compress__(self, data, inlen, flush);
+}
+
+static PyObject *
+Compressor_flush(Compressor *self)
+{
+    return Compressor_compress__(self, NULL, 0, 1);
+}
+
+static PyMethodDef Compressor_methods[] = {
+    { "compress", (PyCFunction)Compressor_compress,
+      METH_VARARGS | METH_KEYWORDS,
+      "Return a string containing data LZX compressed." },
+    { "flush", (PyCFunction)Compressor_flush, METH_NOARGS,
+      "Return a string containing any remaining LZX compressed data." },
+    { NULL }
+};
+
+PyTypeObject CompressorType = {
+    PyObject_HEAD_INIT(NULL)
+    0,                                 /*ob_size*/
+    "lzx.Compressor",                  /*tp_name*/
+    sizeof(Compressor),                /*tp_basicsize*/
+    0,                                 /*tp_itemsize*/
+    (destructor)Compressor_dealloc,    /*tp_dealloc*/
+    0,                                 /*tp_print*/
+    0,                                 /*tp_getattr*/
+    0,                                 /*tp_setattr*/
+    0,                                 /*tp_compare*/
+    0,                                 /*tp_repr*/
+    0,                                 /*tp_as_number*/
+    0,                                 /*tp_as_sequence*/
+    0,                                 /*tp_as_mapping*/
+    0,                                 /*tp_hash */
+    0,                                 /*tp_call*/
+    0,                                 /*tp_str*/
+    0,                                 /*tp_getattro*/
+    0,                                 /*tp_setattro*/
+    0,                                 /*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+    "Compressor objects",              /* tp_doc */
+    (traverseproc)Compressor_traverse, /* tp_traverse */
+    (inquiry)Compressor_clear,         /* tp_clear */
+    0,		                       /* tp_richcompare */
+    0,		                       /* tp_weaklistoffset */
+    0,		                       /* tp_iter */
+    0,		                       /* tp_iternext */
+    Compressor_methods,                /* tp_methods */
+    Compressor_members,                /* tp_members */
+    0,                                 /* tp_getset */
+    0,                                 /* tp_base */
+    0,                                 /* tp_dict */
+    0,                                 /* tp_descr_get */
+    0,                                 /* tp_descr_set */
+    0,                                 /* tp_dictoffset */
+    (initproc)Compressor_init,         /* tp_init */
+    0,                                 /* tp_alloc */
+    Compressor_new,                    /* tp_new */
+};
diff --git a/src/calibre/utils/lzx/lzc.c b/src/calibre/utils/lzx/lzc.c
new file mode 100644
index 0000000000..e1f153d97c
--- /dev/null
+++ b/src/calibre/utils/lzx/lzc.c
@@ -0,0 +1,393 @@
+/*
+    File lz_nonslide.c, part of lzxcomp library
+    Copyright (C) 2002 Matthew T. Russotto
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; version 2.1 only
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/* Force using (actually working) non-sliding version. */
+#define NONSLIDE 1
+#define LZ_ONEBUFFER 1
+#define LAZY 1
+
+/* 
+ * Document here
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#ifdef DEBUG_PERF
+#include <sys/time.h>
+#include <sys/resource.h>
+#endif
+#include "lzc.h"
+
+#define MAX_MATCH 253
+#define MIN_MATCH 2
+
+void lz_init(lz_info *lzi, int wsize, int max_dist,
+	     int max_match, int min_match,
+	     int frame_size,
+	     get_chars_t get_chars,
+	     output_match_t output_match,
+	     output_literal_t output_literal, void *user_data)
+{
+  /* the reason for the separate max_dist value is LZX can't reach the 
+     first three characters in its nominal window.  But using a smaller
+     window results in inefficiency when dealing with reset intervals
+     which are the length of the nominal window */
+
+  lzi->wsize = wsize;
+  if (max_match > wsize)
+    lzi->max_match = wsize;
+  else
+    lzi->max_match = max_match;
+
+  lzi->min_match = min_match;
+  if (lzi->min_match < 3) lzi->min_match = 3;
+
+  lzi->max_dist = max_dist; 
+  lzi->block_buf_size = wsize + lzi->max_dist; 
+  lzi->block_buf = malloc(lzi->block_buf_size);
+  lzi->block_bufe = lzi->block_buf + lzi->block_buf_size;
+  assert(lzi->block_buf != NULL);
+  
+  lzi->cur_loc = 0;
+  lzi->block_loc = 0;
+  lzi->chars_in_buf = 0;
+  lzi->eofcount = 0;
+  lzi->get_chars = get_chars;
+  lzi->output_match = output_match;
+  lzi->output_literal = output_literal;
+  lzi->user_data = user_data;
+  lzi->frame_size = frame_size;
+  lzi->lentab = calloc(lzi->block_buf_size + 1, sizeof(int));
+  lzi->prevtab = calloc(lzi->block_buf_size + 1, sizeof(unsigned char *));
+  lzi->analysis_valid = 0;
+}
+
+void lz_release(lz_info *lzi)
+{
+  free(lzi->block_buf);
+  free(lzi->lentab);
+  free(lzi->prevtab);
+}
+
+void lz_reset(lz_info *lzi)
+{
+  int residual = lzi->chars_in_buf - lzi->block_loc;
+  memmove(lzi->block_buf, lzi->block_buf + lzi->block_loc, residual);
+  lzi->chars_in_buf = residual;
+  lzi->block_loc = 0;
+  lzi->analysis_valid = 0;
+}
+
+#ifdef LZNONSLIDE_MAIN
+typedef struct lz_user_data
+{
+  FILE *infile;
+  FILE *outfile;
+  int R0, R1, R2;
+} lz_user_data;
+
+int tmp_get_chars(lz_info *lzi, int n, unsigned char *buf)
+{
+  lz_user_data *lzud = (lz_user_data *)lzi->user_data;
+  return fread(buf, 1, n, lzud->infile);
+}
+
+int tmp_output_match(lz_info *lzi, int match_pos, int match_len)
+{
+  lz_user_data *lzud = (lz_user_data *)lzi->user_data;
+  int mod_match_loc;
+  
+  mod_match_loc = match_pos;
+
+  fprintf(lzud->outfile, "(%d, %d)(%d)\n", match_pos, match_len, mod_match_loc);
+  return 0;
+}
+
+void tmp_output_literal(lz_info *lzi, unsigned char ch)
+{
+  lz_user_data *lzud = (lz_user_data *)lzi->user_data;
+  fprintf(lzud->outfile, "'%c'", ch);
+}
+
+int main(int argc, char *argv[])
+{
+  int wsize = atoi(argv[1]);
+  lz_info lzi;
+  lz_user_data lzu = {stdin, stdout, 1, 1, 1};
+
+  lz_init(&lzi, wsize, wsize, MAX_MATCH, MIN_MATCH, 8192, tmp_get_chars, tmp_output_match, tmp_output_literal,&lzu);
+  lz_compress(&lzi);
+  return 0;
+}
+#endif
+
+int lz_left_to_process(lz_info *lzi)
+{
+  return lzi->chars_in_buf - lzi->block_loc;
+}
+
+static void
+fill_blockbuf(lz_info *lzi, int maxchars)
+{
+  int toread;
+  unsigned char *readhere;
+  int nread;
+
+  if (lzi->eofcount) return;
+  maxchars -= lz_left_to_process(lzi);
+  toread = lzi->block_buf_size - lzi->chars_in_buf;
+  if (toread > maxchars) toread = maxchars;
+  readhere = lzi->block_buf + lzi->chars_in_buf;
+  nread = lzi->get_chars(lzi, toread, readhere);
+  lzi->chars_in_buf += nread;
+  if (nread != toread)
+    lzi->eofcount++;
+}
+
+static void lz_analyze_block(lz_info *lzi)
+{
+  int *lentab, *lenp;
+  unsigned char **prevtab, **prevp;
+  unsigned char *bbp, *bbe;
+  unsigned char *chartab[256];
+  unsigned char *cursor;
+  int prevlen;
+  int ch;
+  int maxlen;
+  long wasinc;
+  int max_dist = lzi->max_dist;
+#ifdef DEBUG_ANALYZE_BLOCK
+  static short n = 0;
+#endif
+#ifdef DEBUG_PERF
+  struct rusage innerloop;
+  struct timeval innertime, tmptime;
+  struct rusage outerloop;
+  struct timeval outertime;
+  struct rusage initialloop;
+  struct timeval initialtime;
+  struct rusage totalloop;
+  struct timeval totaltime;
+#endif
+
+#ifdef DEBUG_ANALYZE_BLOCK
+  fprintf(stderr, "Analyzing block %d, cur_loc = %06x\n", n, lzi->cur_loc);
+#endif
+  memset(chartab, 0, sizeof(chartab));
+  prevtab = prevp = lzi->prevtab;
+  lentab = lenp = lzi->lentab;
+  memset(prevtab, 0, sizeof(*prevtab) * lzi->chars_in_buf);
+  memset(lentab, 0, sizeof(*lentab) * lzi->chars_in_buf);
+#ifdef DEBUG_PERF
+  memset(&innertime, 0, sizeof(innertime));
+  memset(&outertime, 0, sizeof(outertime));
+  getrusage(RUSAGE_SELF, &initialloop);
+  totalloop = initialloop;
+#endif
+  bbp = lzi->block_buf;
+  bbe = bbp + lzi->chars_in_buf;
+  while (bbp < bbe) {
+    if (chartab[ch = *bbp]) {
+      *prevp = chartab[ch];
+      *lenp = 1;
+    }
+    chartab[ch] = bbp;
+    bbp++;
+    prevp++;
+    lenp++;
+  }
+#ifdef DEBUG_PERF
+  initialtime = initialloop.ru_utime;
+  getrusage(RUSAGE_SELF, &initialloop);
+  timersub(&initialloop.ru_utime, &initialtime, &initialtime);
+#endif
+  wasinc = 1;
+  for (maxlen = 1; wasinc && (maxlen < lzi->max_match); maxlen++) {
+#ifdef DEBUG_PERF
+    getrusage(RUSAGE_SELF, &outerloop);
+#endif
+    bbp = bbe - maxlen - 1;
+    lenp = lentab + lzi->chars_in_buf - maxlen - 1;
+    prevp = prevtab + lzi->chars_in_buf - maxlen - 1;
+    wasinc = 0;
+    while (bbp > lzi->block_buf) {
+      if (*lenp == maxlen) {
+#ifdef DEBUG_PERF
+	getrusage(RUSAGE_SELF, &innerloop);
+#endif
+	ch = bbp[maxlen];
+	cursor = *prevp;
+	while(cursor && ((bbp - cursor) <= max_dist)) {
+	  prevlen = *(cursor - lzi->block_buf + lentab);
+	  if (cursor[maxlen] == ch) {
+	    *prevp = cursor;
+	    (*lenp)++;
+	    wasinc++;
+	    break;
+	  }
+	  if (prevlen != maxlen) break;
+	  cursor = *(cursor - lzi->block_buf + prevtab);
+	}
+#ifdef DEBUG_PERF
+	tmptime = innerloop.ru_utime;
+	getrusage(RUSAGE_SELF, &innerloop);
+	timersub(&innerloop.ru_utime, &tmptime, &tmptime);
+	timeradd(&tmptime, &innertime, &innertime);
+#endif
+      }
+      bbp--;
+      prevp--;
+      lenp--;
+    }
+#ifdef DEBUG_PERF
+    tmptime = outerloop.ru_utime;
+    getrusage(RUSAGE_SELF, &outerloop);
+    timersub(&outerloop.ru_utime, &tmptime, &tmptime);
+    timeradd(&tmptime, &outertime, &outertime);
+#endif
+    //    fprintf(stderr, "maxlen = %d, wasinc = %ld\n", maxlen, wasinc);
+  }
+#ifdef DEBUG_PERF
+  totaltime = totalloop.ru_utime;
+  getrusage(RUSAGE_SELF, &totalloop);
+  timersub(&totalloop.ru_utime, &totaltime, &totaltime);
+  fprintf(stderr, "Time spend in initial loop = %f\n", initialtime.tv_sec + initialtime.tv_usec/(double)1E6);
+  fprintf(stderr, "Time spend in outer loop = %f\n", outertime.tv_sec + outertime.tv_usec/(double)1E6);
+  fprintf(stderr, "Time spend in inner loop = %f\n", innertime.tv_sec + innertime.tv_usec/(double)1E6);
+  fprintf(stderr, "Time spend in all loops = %f\n", totaltime.tv_sec + totaltime.tv_usec/(double)1E6);
+#endif
+  lzi->analysis_valid = 1;
+#ifdef DEBUG_ANALYZE_BLOCK
+  fprintf(stderr, "Done analyzing block %d, cur_loc = %06x\n", n++, lzi->cur_loc);
+#endif
+}
+
+void lz_stop_compressing(lz_info *lzi) 
+{
+  lzi->stop = 1;
+  /*  fprintf(stderr, "Stopping...\n");*/
+}
+
+int lz_compress(lz_info *lzi, int nchars) 
+{
+
+  unsigned char *bbp, *bbe;
+  int *lentab, *lenp;
+  unsigned char **prevtab, **prevp;
+  int len;
+  int holdback;
+  short trimmed;
+
+  lzi->stop = 0;
+  while ((lz_left_to_process(lzi) || !lzi->eofcount) && !lzi->stop && nchars > 0) {
+#if 1
+    if (!lzi->analysis_valid ||
+	(!lzi->eofcount &&
+	 ((lzi->chars_in_buf- lzi->block_loc) < nchars))) {
+      int residual = lzi->chars_in_buf - lzi->block_loc;
+      int bytes_to_move = lzi->max_dist + residual;
+      if (bytes_to_move > lzi->chars_in_buf)
+	bytes_to_move = lzi->chars_in_buf;
+#ifdef DEBUG_ANALYZE_BLOCK
+      fprintf(stderr, "Moving %06x, chars_in_buf %06x, residual = %06x, nchars= %06x block_loc = %06x\n", bytes_to_move, lzi->chars_in_buf, residual, nchars, lzi->block_loc);
+#endif
+      memmove(lzi->block_buf, lzi->block_buf + lzi->chars_in_buf - bytes_to_move,
+	      bytes_to_move);
+      
+      lzi->block_loc = bytes_to_move - residual;
+      lzi->chars_in_buf = bytes_to_move;
+#ifdef DEBUG_ANALYZE_BLOCK
+      fprintf(stderr, "New chars_in_buf %06x,  new block_loc = %06x, eof = %1d\n", lzi->chars_in_buf, lzi->block_loc, lzi->eofcount);
+#endif
+      fill_blockbuf(lzi, nchars);
+#ifdef DEBUG_ANALYZE_BLOCK
+      fprintf(stderr, "Really new chars_in_buf %06x,  new block_loc = %06x, eof = %1d\n", lzi->chars_in_buf, lzi->block_loc, lzi->eofcount);
+#endif
+      lz_analyze_block(lzi);
+    }
+#else
+    if (!lzi->analysis_valid ||
+	(lzi->block_loc - lzi->chars_in_buf) == 0) {
+      lzi->block_loc = 0;
+      lzi->chars_in_buf = 0;
+      fill_blockbuf(lzi, nchars);
+      lz_analyze_block(lzi);
+    }
+#endif
+    prevtab = prevp = lzi->prevtab + lzi->block_loc;
+    lentab = lenp = lzi->lentab + lzi->block_loc;
+    bbp = lzi->block_buf + lzi->block_loc;
+    holdback = lzi->max_match;
+    if (lzi->eofcount) holdback = 0;
+    if (lzi->chars_in_buf < (nchars + lzi->block_loc))
+      bbe = lzi->block_buf + lzi->chars_in_buf - holdback;
+    else
+      bbe = bbp + nchars;
+    while ((bbp < bbe) && (!lzi->stop)) {
+      trimmed = 0;
+      len = *lenp;
+      if (lzi->frame_size && (len > (lzi->frame_size - lzi->cur_loc % lzi->frame_size))) {
+#ifdef DEBUG_TRIMMING
+	fprintf(stderr, "Trim for framing: %06x %d %d\n", lzi->cur_loc,len, (lzi->frame_size - lzi->cur_loc % lzi->frame_size));
+#endif
+	trimmed = 1;
+	len = (lzi->frame_size - lzi->cur_loc % lzi->frame_size);
+      }
+      if (len > nchars) {
+#ifdef DEBUG_TRIMMING
+	fprintf(stderr, "Trim for blocking: %06x %d %d\n", lzi->cur_loc,len, nchars);
+#endif
+	trimmed = 1;
+	len = nchars;
+      }
+      if (len >= lzi->min_match) {
+#ifdef LAZY
+	if ((bbp < bbe -1) && !trimmed &&
+	    ((lenp[1] > (len + 1)) /* || ((lenp[1] == len) && (prevp[1] > prevp[0])) */)) {
+	  len = 1;
+	  /* this is the lazy eval case */
+	}
+	else 
+#endif
+	  if (lzi->output_match(lzi, (*prevp - lzi->block_buf) - lzi->block_loc,
+				len) < 0) {
+	    //	    fprintf(stderr, "Match rejected: %06x %d\n", lzi->cur_loc, len);
+	    len = 1; /* match rejected */
+	  }
+      }
+      else
+	len = 1;
+      
+      if (len < lzi->min_match) {
+	assert(len == 1);
+	lzi->output_literal(lzi, *bbp);
+      }
+      //      fprintf(stderr, "len = %3d, *lenp = %3d, cur_loc = %06x, block_loc = %06x\n", len, *lenp, lzi->cur_loc, lzi->block_loc);
+      bbp += len;
+      prevp += len;
+      lenp += len;
+      lzi->cur_loc += len;
+      lzi->block_loc += len;
+      assert(nchars >= len);
+      nchars -= len;
+
+    }
+  }
+  return 0;
+}
diff --git a/src/calibre/utils/lzx/lzc.h b/src/calibre/utils/lzx/lzc.h
new file mode 100644
index 0000000000..8a24f2c090
--- /dev/null
+++ b/src/calibre/utils/lzx/lzc.h
@@ -0,0 +1,60 @@
+/*
+    File lz_nonslide.h, part of lzxcomp library
+    Copyright (C) 2002 Matthew T. Russotto
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; version 2.1 only
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+typedef struct lz_info lz_info;
+typedef int (*get_chars_t)(lz_info *lzi, int n, unsigned char *buf);
+typedef int (*output_match_t)(lz_info *lzi, int match_pos, int match_len);
+typedef void (*output_literal_t)(lz_info *lzi, unsigned char ch);
+
+struct lz_info
+{
+  int wsize; /* window size in bytes */
+  int max_match; /* size of longest match in bytes */
+  int min_match;
+  unsigned char *block_buf;
+  unsigned char *block_bufe;
+  int block_buf_size;
+  int chars_in_buf;
+  int cur_loc;            /* location within stream */
+  int block_loc;
+  int frame_size;
+  int max_dist;
+  unsigned char **prevtab;
+  int *lentab;
+  short eofcount;
+  short stop;
+  short analysis_valid;
+
+  get_chars_t get_chars;
+  output_match_t output_match;
+  output_literal_t output_literal;
+  void *user_data;
+};
+
+void lz_init(lz_info *lzi, int wsize, int max_dist,
+	     int max_match, int min_match,
+	     int frame_size,
+	     get_chars_t get_chars,
+	     output_match_t output_match,
+	     output_literal_t output_literal, void *user_data);
+
+void lz_release(lz_info *lzi);
+
+void lz_reset(lz_info *lzi);
+void lz_stop_compressing(lz_info *lzi);
+int lz_left_to_process(lz_info *lzi); /* returns # chars read in but unprocessed */
+int lz_compress(lz_info *lzi, int nchars);
diff --git a/src/calibre/utils/lzx/lzxc.c b/src/calibre/utils/lzx/lzxc.c
new file mode 100644
index 0000000000..626c829480
--- /dev/null
+++ b/src/calibre/utils/lzx/lzxc.c
@@ -0,0 +1,1287 @@
+/*
+    File lzx_layer.c, part of lzxcomp library
+    Copyright (C) 2002 Matthew T. Russotto
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; version 2.1 only
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+/* Force using (actually working) non-sliding version. */
+#define NONSLIDE 1
+#define LZ_ONEBUFFER 1
+#define LAZY 1
+
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef _MSC_VER
+# include "msstdint.h"
+#else /* _MSC_VER */
+# include <stdint.h>
+#endif /* _MSC_VER */
+#include <string.h> /* for memset on Linux */
+#include <assert.h>
+#include <math.h>
+
+#ifdef BYTE_ORDER
+# if BYTE_ORDER == BIG_ENDIAN
+#  define LZX_BIG_ENDIAN
+# endif /* BYTE_ORDER == BIG_ENDIAN */
+#endif /* BYTE_ORDER */
+
+#ifdef NONSLIDE
+#include "lzc.h"
+#else
+#include "hash_slide.h"
+#include "lz_slide.h"
+#endif
+#include "lzxc.h"
+
+/* these named constants are from the Microsoft LZX documentation */
+#define MIN_MATCH                            2
+#define MAX_MATCH                          257
+#define NUM_CHARS                          256
+#define NUM_PRIMARY_LENGTHS                  7
+#define NUM_SECONDARY_LENGTHS              249
+
+/* the names of these constants are specific to this library */
+#define LZX_MAX_CODE_LENGTH                 16
+#define LZX_FRAME_SIZE                   32768
+#define LZX_PRETREE_SIZE                    20
+#define LZX_ALIGNED_BITS                     3
+#define LZX_ALIGNED_SIZE                     8
+
+#define LZX_VERBATIM_BLOCK                   1
+#define LZX_ALIGNED_OFFSET_BLOCK             2
+
+/* Debugging defines useful during development.  All add diagnostic output
+   at various points in the system */
+
+/*#define DEBUG_MATCHES       *//* When matches come in from the LZ engine */
+/*#define DEBUG_MATCHES_2     *//* When matches are being output           */
+/*#define DEBUG_HUFFMAN       *//* When huffman trees are built            */
+/*#define DEBUG_ENTROPY       *//* In entropy calculation                  */
+/*#define DEBUG_LZ            *//* Uncompressed input reconstructed from
+                                 LZ engine                               */
+/*#define DEBUG_BITBUF        *//* Raw output to upper layer               */
+/*#define DEBUG_EXTRA_BITS    *//* Savings due to extra bits huffman tree  */
+/*#define DEBUG_POSITION_SLOT_LOOKUP */
+/*#define DEBUG_TREE_COMPRESSION   *//* During RLE compression of trees    */
+
+/* number of position slots given window_size-5 */
+/* as corrected by Caie */
+short num_position_slots[] = {30, 32, 34, 36, 38, 42, 50};
+unsigned long position_base[51];
+unsigned char extra_bits[52];
+double rloge2;
+
+typedef struct ih_elem {
+  int freq;
+  short sym;
+  short pathlength;
+  struct ih_elem *parent;
+  struct ih_elem *left;
+  struct ih_elem *right;
+} ih_elem;
+
+typedef struct h_elem {
+  int freq;
+  short sym;
+  short pathlength;
+  struct ih_elem *parent;
+  unsigned short code;
+} h_elem;
+
+typedef struct huff_entry {
+  short codelength;
+  unsigned short code;
+} huff_entry;
+
+static int cmp_leaves(const void *in_a, const void *in_b)
+{
+  const struct h_elem *a = in_a;
+  const struct h_elem *b = in_b;
+  
+  if (!a->freq && b->freq)
+    return 1;
+  if (a->freq && !b->freq)
+    return -1;
+  
+  if (a->freq == b->freq)
+    return a->sym - b->sym;
+      
+  return a->freq - b->freq;
+}
+
+static int
+cmp_pathlengths(const void *in_a, const void *in_b)
+{
+  const struct h_elem *a = in_a;
+  const struct h_elem *b = in_b;
+  
+  if (a->pathlength == b->pathlength)
+#if 0
+    return a->sym - b->sym;
+#else
+  /* see note on canonical pathlengths */
+    return b->sym - a->sym;
+#endif
+  return b->pathlength - a->pathlength;
+}
+
+/* standard huffman building algorithm */
+static void 
+build_huffman_tree(int nelem, int max_code_length, int *freq, huff_entry *tree)
+{
+  h_elem *leaves = malloc(nelem * sizeof(h_elem));
+  ih_elem *inodes;
+  ih_elem *next_inode;
+  ih_elem *cur_inode;
+  h_elem *cur_leaf;
+  int leaves_left;
+  int nleaves;
+  int pathlength;
+  unsigned short cur_code;
+  short codes_too_long = 0;
+  ih_elem *f1, *f2;
+  int i;
+
+  for (i = 0; i < nelem; i++) {
+    leaves[i].freq = freq[i];
+    leaves[i].sym = i;
+    leaves[i].pathlength = 0;
+  }
+  qsort(leaves, nelem, sizeof(h_elem), cmp_leaves);
+  for (leaves_left = 0; leaves_left < nelem; leaves_left++) {
+#ifdef DEBUG_HUFFMAN
+    fprintf(stderr, "%3d: %3d '%c'\n", leaves_left, leaves[leaves_left].freq,
+	    leaves[leaves_left].sym);
+#endif
+    if (!leaves[leaves_left].freq) break;
+  }
+  nleaves = leaves_left;
+
+  if (nleaves >= 2) {
+    inodes = malloc((nelem-1) * sizeof(ih_elem));
+    do {
+      if (codes_too_long) {
+	for (leaves_left = 0; leaves_left < nelem; leaves_left++) {
+	  if (!leaves[leaves_left].freq) break;
+	  if (leaves[leaves_left].freq != 1) {
+	    leaves[leaves_left].freq >>= 1;
+	    codes_too_long = 0;
+	  }
+	}
+	assert (!codes_too_long);
+      }
+      
+      cur_leaf = leaves;
+      next_inode = cur_inode = inodes;
+      
+      do {
+	f1 = f2 = NULL;
+	if (leaves_left && 
+	    ((cur_inode == next_inode) ||
+	     (cur_leaf->freq <= cur_inode->freq))) {
+	  f1 = (ih_elem *)cur_leaf++;
+	  leaves_left--;
+	}
+	else if (cur_inode != next_inode) {
+	  f1 = cur_inode++;
+	}
+	
+	if (leaves_left && 
+	    ((cur_inode == next_inode) ||
+	     (cur_leaf->freq <= cur_inode->freq))) {
+	  f2 = (ih_elem *)cur_leaf++;
+	  leaves_left--;
+	}
+	else if (cur_inode != next_inode) {
+	  f2 = cur_inode++;
+	}
+	
+#ifdef DEBUG_HUFFMAN
+	fprintf(stderr, "%d %d\n", f1, f2);
+#endif
+	if (f1 && f2) {
+	  next_inode->freq = f1->freq + f2->freq;
+	  next_inode->sym = -1;
+	  next_inode->left = f1;
+	  next_inode->right = f2;
+	  next_inode->parent = NULL;
+	  f1->parent = next_inode;
+	  f2->parent = next_inode;
+	  if (f1->pathlength > f2->pathlength)
+	    next_inode->pathlength = f1->pathlength + 1;
+	  else
+	    next_inode->pathlength = f2->pathlength + 1;
+	  if (next_inode->pathlength > max_code_length) {
+	    codes_too_long = 1;
+	    break;
+	  }
+	  next_inode++;
+	}
+      }
+      while (f1 && f2);
+    }
+    while (codes_too_long);
+    
+#ifdef DEBUG_HUFFMAN
+    cur_inode = inodes;
+    while (cur_inode < next_inode) {
+      fprintf(stderr, "%d l: %3d%c  r: %3d%c  freq: %8d\n", 
+	      cur_inode - inodes,
+	      (cur_inode->left->sym!=-1)?(((struct h_elem *)cur_inode->left)-leaves):(cur_inode->left-inodes),
+	      (cur_inode->left->sym!=-1)?'l':'i',
+	      (cur_inode->right->sym!=-1)?(((struct h_elem *)cur_inode->right)-leaves):(cur_inode->right-inodes),
+	      (cur_inode->right->sym!=-1)?'l':'i',
+	      (cur_inode->freq)
+	      );
+      cur_inode++;
+    }
+#endif
+    
+    /* now traverse tree depth-first */
+    cur_inode = next_inode - 1;
+    pathlength = 0;
+    cur_inode->pathlength = -1;
+    do {
+      /* precondition: at unmarked node*/
+      if (cur_inode->sym == -1) /*&& (cur_inode->left)*/ {
+	/* left node of unmarked node is unmarked */
+	cur_inode = cur_inode->left;
+	cur_inode->pathlength = -1;
+	pathlength++;
+      }
+      else {
+	/* mark node */
+	cur_inode->pathlength = pathlength;
+#if 0 
+	if (cur_inode->right) {
+	  /* right node of previously unmarked node is unmarked */
+	  cur_inode = cur_inode->right;
+	  cur_inode->pathlength = -1;
+	  pathlength++;
+	}
+	else 
+#endif
+	  {
+	    
+	    /* time to come up.  Keep coming up until an unmarked node is reached */
+	    /* or the tree is exhausted */
+	    do {
+	      cur_inode = cur_inode->parent;
+	      pathlength--;
+	    }
+	    while (cur_inode && (cur_inode->pathlength != -1));
+	    if (cur_inode) {
+	      /* found unmarked node; mark it and go right */
+	      cur_inode->pathlength = pathlength;
+	      cur_inode = cur_inode->right;
+	      cur_inode->pathlength = -1;
+	      pathlength++;
+	      /* would be complex if cur_inode could be null here.  It can't */
+	    }
+	  }
+      }
+    }
+    while (cur_inode);
+    
+#ifdef DEBUG_HUFFMAN
+    cur_inode = inodes;
+    while (cur_inode < next_inode) {
+      fprintf(stderr, "%d l: %3d%c  r: %3d%c  freq: %8d  pathlength %4d\n", 
+	      cur_inode - inodes,
+	      (cur_inode->left->sym!=-1)?(((struct h_elem *)cur_inode->left)-leaves):(cur_inode->left-inodes),
+	      (cur_inode->left->sym!=-1)?'l':'i',
+	      (cur_inode->right->sym!=-1)?(((struct h_elem *)cur_inode->right)-leaves):(cur_inode->right-inodes),
+	      (cur_inode->right->sym!=-1)?'l':'i',	
+	      (cur_inode->freq),
+	      (cur_inode->pathlength)
+	      );
+      cur_inode++;
+    }
+#endif
+    free(inodes);
+    
+    /* the pathlengths are already in order, so this sorts by symbol */
+    qsort(leaves, nelem, sizeof(h_elem), cmp_pathlengths);
+    
+    /** 
+	Microsoft's second condition on its canonical huffman codes is:
+
+	For each level, starting at the deepest level of the tree and then
+	moving upwards, leaf nodes must start as far left as possible. An
+	alternative way of stating this constraint is that if any tree node
+	has children then all tree nodes to the left of it with the same path
+	length must also have children.
+	
+	These 'alternatives' are not equivalent.  The latter alternative gives
+	the common canonical code where the longest code is all zeros.  The former
+	gives an opposite code where the longest code is all ones.  Microsoft uses the
+	former alternative.
+    **/
+    
+#if 0
+    pathlength = leaves[0].pathlength;
+    cur_code = 0;
+    for (i = 0; i < nleaves; i++) {
+      while (leaves[i].pathlength < pathlength) {
+	assert(!(cur_code & 1));
+	cur_code >>= 1;
+	pathlength--;
+      }
+      leaves[i].code = cur_code;
+      cur_code++;
+    }
+#else
+    pathlength = leaves[nleaves-1].pathlength;
+    assert(leaves[0].pathlength <= 16); /* this method cannot deal with bigger codes, though
+					   the other canonical method can in some cases
+					   (because it starts with zeros ) */
+    cur_code = 0;
+    for (i = nleaves - 1; i >= 0; i--) {
+      while (leaves[i].pathlength > pathlength) {
+	cur_code <<= 1;
+	pathlength++;
+      }
+      leaves[i].code = cur_code;
+      cur_code++;
+    }
+#endif
+    
+#ifdef DEBUG_HUFFMAN
+    for (i = 0; i < nleaves; i++) {
+      char code[18];
+      int j;
+      
+      cur_code = leaves[i].code;
+      code[leaves[i].pathlength] = 0;
+      for (j = leaves[i].pathlength-1; j >= 0; j--) {
+	if (cur_code & 1) code[j] = '1';
+	else code[j] = '0';
+	cur_code >>= 1;
+      }
+      fprintf(stderr, "%3d: %3d %3d %-16.16s '%c'\n", i, leaves[i].freq, leaves[i].pathlength, code,
+	      leaves[i].sym);
+    }
+#endif
+  }
+  else if (nleaves == 1) {
+    /* 0 symbols is OK (not according to doc, but according to Caie) */
+    /* but if only one symbol is present, two symbols are required */
+    nleaves = 2;
+    leaves[0].pathlength = leaves[1].pathlength = 1;
+    if (leaves[1].sym > leaves[0].sym) {
+      leaves[1].code = 1;
+      leaves[0].code = 0;
+    }
+    else {
+      leaves[0].code = 1;
+      leaves[1].code = 0;
+    }
+  }
+   
+  memset(tree, 0, nelem * sizeof(huff_entry));
+  for (i = 0; i < nleaves; i++) {
+    tree[leaves[i].sym].codelength = leaves[i].pathlength;
+    tree[leaves[i].sym].code = leaves[i].code;
+  }
+  
+  free(leaves);
+}
+  
+/* from Stuart Caie's code -- I'm hoping this code is too small to encumber
+   this file.  If not, you could rip it out and hard-code the tables */
+   
+static void lzx_init_static(void)
+{
+  int i, j;
+
+  if (extra_bits[49]) return;
+
+  rloge2 = 1.0/log(2);
+  for (i=0, j=0; i <= 50; i += 2) {
+    extra_bits[i] = extra_bits[i+1] = j; /* 0,0,0,0,1,1,2,2,3,3... */
+    if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
+  }
+
+  for (i=0, j=0; i <= 50; i++) {
+    position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
+    j += 1 << extra_bits[i]; /* 1,1,1,1,2,2,4,4,8,8,16,16,32,32,... */
+  }
+}
+
+struct lzxc_data
+{
+  void *in_arg;
+  void *out_arg;
+  void *mark_frame_arg;
+  lzxc_get_bytes_t get_bytes;
+  lzxc_at_eof_t at_eof;
+  lzxc_put_bytes_t put_bytes;
+  lzxc_mark_frame_t mark_frame;
+  struct lz_info *lzi;
+  /* a 'frame' is an 0x8000 byte thing.  Called that because otherwise
+     I'd confuse myself overloading 'block' */
+  int left_in_frame;
+  int left_in_block;
+  int R0, R1, R2;
+  int num_position_slots;
+  /* this is the LZX block size */
+  int block_size;
+  int *main_freq_table;
+  int length_freq_table[NUM_SECONDARY_LENGTHS];
+  int aligned_freq_table[LZX_ALIGNED_SIZE];
+  uint32_t *block_codes;
+  uint32_t *block_codesp;
+  huff_entry *main_tree;
+  huff_entry length_tree[NUM_SECONDARY_LENGTHS];
+  huff_entry aligned_tree[LZX_ALIGNED_SIZE];
+  int main_tree_size;
+  uint16_t bit_buf;
+  int bits_in_buf;
+  double main_entropy;
+  double last_ratio;
+  uint8_t *prev_main_treelengths;
+  uint8_t prev_length_treelengths[NUM_SECONDARY_LENGTHS];
+  uint32_t len_uncompressed_input;
+  uint32_t len_compressed_output;
+  short need_1bit_header;
+  short subdivide; /* 0 = don't subdivide, 1 = allowed, -1 = requested */
+};
+
+static int
+lzx_get_chars(lz_info *lzi, int n, unsigned char *buf)
+{
+  /* force lz compression to stop after every block */
+  int chars_read;
+  int chars_pad;
+
+  lzxc_data *lzud = (lzxc_data *)lzi->user_data;
+#ifdef OLDFRAMING
+  if (lzud->subdivide < 0) return 0;
+  if (n > lzud->left_in_frame)
+    n = lzud->left_in_frame;
+  if (n > lzud->left_in_block)
+    n = lzud->left_in_block;
+#endif
+  chars_read = lzud->get_bytes(lzud->in_arg, n, buf);
+#ifdef OLDFRAMING
+  lzud->left_in_frame -= chars_read;
+  lzud->left_in_block -= chars_read;
+#else
+  lzud->left_in_frame -= chars_read % LZX_FRAME_SIZE;
+  if (lzud->left_in_frame < 0) 
+    lzud->left_in_frame += LZX_FRAME_SIZE;
+#endif
+  if ((chars_read < n) && (lzud->left_in_frame)) {
+    chars_pad = n - chars_read;
+    if (chars_pad > lzud->left_in_frame) chars_pad = lzud->left_in_frame;
+    /* never emit a full frame of padding.  This prevents silliness when
+       lzx_compress is called when at EOF but EOF not yet detected */
+    if (chars_pad == LZX_FRAME_SIZE) chars_pad = 0;
+#ifdef OLDFRAMING
+    if (chars_pad > lzud->left_in_block) chars_pad = lzud->left_in_block;
+#endif
+    memset(buf + chars_read, 0, chars_pad);
+    lzud->left_in_frame -= chars_pad;
+#ifdef OLDFRAMING
+    lzud->left_in_block -= chars_pad;
+#endif
+    chars_read += chars_pad;
+  }
+  return chars_read;
+}
+
+#ifdef NONSLIDE
+static int find_match_at(lz_info *lzi, int loc, int match_len, int *match_locp)
+{
+  unsigned char *matchb;
+  unsigned char *nmatchb;
+  unsigned char *c1, *c2;
+  int j;
+
+  if (-*match_locp == loc) return -1;
+  if (loc < match_len) return -1;
+
+  matchb = lzi->block_buf + lzi->block_loc + *match_locp;
+  nmatchb = lzi->block_buf + lzi->block_loc - loc;
+  c1 = matchb;
+  c2 = nmatchb;
+  for (j = 0; j < match_len; j++) {
+    if (*c1++ != *c2++) break;
+  }
+  if (j == match_len) {
+#ifdef DEBUG_MATCHES
+    fprintf(stderr, "match found %d, old = %d new = %d len = %d\n", lzi->cur_loc, -*match_locp, loc, match_len);
+#endif
+    *match_locp = -loc;
+    return 0;
+  }
+  return -1;
+}
+#else
+static int find_match_at(lz_info *lzi, int loc, int match_len, int *match_locp)
+{
+  unsigned char *matchb;
+  unsigned char *nmatchb;
+  unsigned char *c1, *c2;
+  int j;
+
+  if (-*match_locp == loc) return -1;
+  if (loc < match_len) return -1;
+
+  matchb = lzi->slide_bufp + *match_locp;
+  if (matchb < lzi->slide_buf) matchb += lzi->slide_buf_size;
+  nmatchb = lzi->slide_bufp - loc;
+  if (nmatchb < lzi->slide_buf) nmatchb += lzi->slide_buf_size;
+  c1 = matchb;
+  c2 = nmatchb;
+  for (j = 0; j < match_len; j++) {
+    if (*c1++ != *c2++) break;
+    if (c1 == lzi->slide_bufe) c1 = lzi->slide_buf;
+    if (c2 == lzi->slide_bufe) c2 = lzi->slide_buf;
+  }
+  if (j == match_len) {
+#ifdef DEBUG_MATCHES
+    fprintf(stderr, "match found %d, old = %d new = %d len = %d\n", lzi->cur_loc, -*match_locp, loc, match_len);
+#endif
+    *match_locp = -loc;
+    return 0;
+  }
+  return -1;
+}
+#endif
+static void check_entropy(lzxc_data *lzud, int main_index) 
+{
+  /* entropy = - sum_alphabet P(x) * log2 P(x) */
+  /* entropy = - sum_alphabet f(x)/N * log2 (f(x)/N) */
+  /* entropy = - 1/N sum_alphabet f(x) * (log2 f(x) - log2 N) */
+  /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - sum_alphabet f(x) log2 N */
+  /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - log2 N sum_alphabet f(x)  */
+  /* entropy = - 1/N (sum_alphabet f(x) * log2 f(x)) - N * log2 N   */
+  
+  /* entropy = - 1/N ((sum_alphabet f(x) * log2 f(x) ) - N * log2 N) */
+  /* entropy = - 1/N ((sum_alphabet f(x) * ln f(x) * 1/ln 2) - N * ln N * 1/ln 2) */
+  /* entropy = 1/(N ln 2) (N * ln N - (sum_alphabet f(x) * ln f(x))) */
+  /* entropy = 1/(N ln 2) (N * ln N + (sum_alphabet -f(x) * ln f(x))) */
+  
+  /* entropy = 1/(N ln 2) ( sum_alphabet ln N * f(x) + (sum_alphabet -f(x) * ln f(x))) */
+  /* entropy = 1/(N ln 2) ( sum_alphabet ln N * f(x) +  (-f(x) * ln f(x))) */
+  /* entropy = -1/(N ln 2) ( sum_alphabet -ln N * f(x) +  (f(x) * ln f(x))) */
+  /* entropy = -1/(N ln 2) ( sum_alphabet f(x)(- ln N  + ln f(x))) */
+  /* entropy = -1/(N ln 2) ( sum_alphabet f(x)(ln f(x)/N)) */
+  /* entropy = -1/N  ( sum_alphabet (1/(ln 2))f(x)(ln f(x)/N)) */
+  /* entropy = -1/N  ( sum_alphabet f(x)(log2 f(x)/N)) */
+  /* entropy = -  ( sum_alphabet f(x)/N(log2 f(x)/N)) */
+  /* entropy = -  ( sum_alphabet P(x)(log2 P(x))) */
+  
+
+    double freq;
+    double n_ln_n;
+    double rn_ln2;
+    double cur_ratio;
+    int n;
+    
+    /* delete old entropy accumulation */
+    if (lzud->main_freq_table[main_index] != 1) {
+      freq = (double)lzud->main_freq_table[main_index]-1;
+      lzud->main_entropy += freq * log(freq);
+    }
+    /* add new entropy accumulation */
+    freq = (double)lzud->main_freq_table[main_index];
+    lzud->main_entropy -= freq * log(freq);
+    n = lzud->block_codesp - lzud->block_codes;
+
+    if (((n & 0xFFF) == 0) && (lzud->left_in_block >= 0x1000)) {
+      n_ln_n = (double)n * log((double)n);
+      rn_ln2 = rloge2 / (double)n;
+      cur_ratio = (n * rn_ln2 *(n_ln_n + lzud->main_entropy) + 24 + 3 * 80 + NUM_CHARS + (lzud->main_tree_size-NUM_CHARS)*3 + NUM_SECONDARY_LENGTHS ) / (double)n;
+#ifdef DEBUG_ENTROPY
+      fprintf(stderr, "n = %d\n", n);
+      fprintf(stderr, "main entropy = %f\n", rn_ln2 *(n_ln_n + lzud->main_entropy) );
+      fprintf(stderr, "compression ratio (raw) = %f\n", 100.0 * rn_ln2 *(n_ln_n + lzud->main_entropy) /9.0 );
+      fprintf(stderr, "compression ratio (ovh) = %f\n", 100.0 * cur_ratio/9.0);
+#endif
+      if (cur_ratio > lzud->last_ratio) {
+#ifdef DEBUG_ENTROPY
+	fprintf(stderr, "resetting huffman tables at %d\n", n);
+#endif
+	lzud->subdivide = -1;
+	lz_stop_compressing(lzud->lzi);
+      }
+      lzud->last_ratio = cur_ratio;
+    }
+}
+
+static int
+lzx_output_match(lz_info *lzi, int match_pos, int match_len)
+{
+  lzxc_data *lzud = (lzxc_data *)lzi->user_data;
+  uint32_t formatted_offset;
+  uint32_t position_footer;
+  uint8_t length_footer;
+  uint8_t length_header;
+  uint16_t len_pos_header;
+  int position_slot;
+  short btdt;
+
+#ifdef DEBUG_LZ
+  {
+    int i;
+    int pos;
+    for (i = 0; i < match_len; i++) {
+      
+#ifdef NONSLIDE
+      pos = match_pos + lzi->block_loc + i;
+      fprintf(stderr, "%c", lzi->block_buf[pos]);
+#else
+      pos = match_pos + lzi->front_offset + i;
+      if (pos > lzi->slide_buf_size)
+	pos -= lzi->slide_buf_size;
+      fprintf(stderr, "%c", lzi->slide_buf[pos]);
+#endif
+    }
+  }
+#endif
+  position_footer = 0;
+  btdt = 0;
+ testforr:
+  if (match_pos == -lzud->R0) {
+    match_pos = 0;
+    formatted_offset = 0;
+    position_slot = 0;
+  }
+  else if (match_pos == -lzud->R1) {
+    lzud->R1 = lzud->R0;
+    lzud->R0 = -match_pos;
+    match_pos = 1;
+    formatted_offset = 1;
+    position_slot = 1;
+  }
+  else if (match_pos == -lzud->R2) {
+    lzud->R2 = lzud->R0;
+    lzud->R0 = -match_pos;
+    match_pos = 2;
+    formatted_offset = 2;
+    position_slot = 2;
+  }
+  else {
+    if (!btdt) {
+      btdt = 1;
+      if (find_match_at(lzi, lzud->R0, match_len, &match_pos) == 0)
+	goto testforr;
+      if (find_match_at(lzi, lzud->R1, match_len, &match_pos) == 0)
+	goto testforr;
+      if (find_match_at(lzi, lzud->R2, match_len, &match_pos) == 0)
+	goto testforr;
+    }
+
+    formatted_offset = -match_pos + 2;
+
+    if ((match_len < 3) ||
+	((formatted_offset >= 64) && (match_len < 4)) ||
+	((formatted_offset >= 2048) && (match_len < 5)) ||
+	((formatted_offset >= 65536) && (match_len < 6))) {
+      /* reject matches where extra_bits will likely be bigger than just outputting
+	 literals.  The numbers are basically derived through guessing
+         and trial and error */
+      return -1; /* reject the match */
+    }
+
+    lzud->R2 = lzud->R1;
+    lzud->R1 = lzud->R0;
+    lzud->R0 = -match_pos;
+
+  /* calculate position base using binary search of table; if log2 can be
+     done in hardware, approximation might work; 
+     trunc(log2(formatted_offset*formatted_offset)) gets either the proper
+     position slot or the next one, except for slots 0, 1, and 39-49
+
+     Slots 0-1 are handled by the R0-R1 procedures
+
+     Slots 36-49 (formatted_offset >= 262144) can be found by 
+     (formatted_offset/131072) + 34 ==
+     (formatted_offset >> 17) + 34;
+  */
+    if (formatted_offset >= 262144) {
+      position_slot = (formatted_offset >> 17) + 34;
+    }
+    else {
+      int left, right, mid;
+
+      left = 3;
+      right = lzud->num_position_slots - 1;
+      position_slot = -1;
+      while (left <= right) {
+	mid = (left + right)/2;
+	if ((position_base[mid] <= formatted_offset) &&
+	    position_base[mid+1] > formatted_offset) {
+	  position_slot = mid;
+	  break;
+	}
+#if 0
+	fprintf(stderr, "BEFORE: %06x %06x %06x %06x\n",
+		position_base[left], position_base[mid],
+		formatted_offset, position_base[right]);
+#endif
+	if (formatted_offset > position_base[mid])
+	  /* too low */
+	  left = mid + 1;
+	else /* too high */
+	  right = mid;
+#if 0
+	fprintf(stderr, "AFTER : %06x %06x %06x %06x\n",
+		position_base[left], position_base[mid],
+		formatted_offset, position_base[right]);
+#endif
+      }
+#ifdef DEBUG_POSITION_SLOT_LOOKUP
+      if (position_slot < 0) {
+	fprintf(stderr, "lmr npr: %d %d %d %d\n", left, mid, right, lzud->num_position_slots);
+	fprintf(stderr, "AFTER : %07d %07d %07d %07d\n",
+		position_base[left], position_base[mid],
+		formatted_offset, position_base[right]);
+	fprintf(stderr, "(%d, %d, %d, %d, %d)\n", match_pos, match_len, formatted_offset, position_slot, position_footer);
+      }
+#endif
+      assert(position_slot >= 0);
+      /* FIXME precalc extra_mask table */
+    }
+    position_footer = ((1UL << extra_bits[position_slot]) - 1) & formatted_offset;
+  }
+#ifdef DEBUG_MATCHES
+#ifdef NONSLIDE
+  fprintf(stderr, "(%08x, %d, %d, %d, %d, %d)\n", lzud->lzi->cur_loc , match_pos, match_len, formatted_offset, position_slot, position_footer);
+#else
+  fprintf(stderr, "(%08x, %d, %d, %d, %d, %d)\n", lzud->lzi->cur_loc - lzud->lzi->chars_in_match , match_pos, match_len, formatted_offset, position_slot, position_footer);
+#endif
+#endif
+  /* match length = 8 bits */
+  /* position_slot = 6 bits */
+  /* position_footer = 17 bits */
+  /* total = 31 bits */
+  /* plus one to say whether it's a literal or not */
+  *lzud->block_codesp++ = 0x80000000 | /* bit 31 in intelligent bit ordering */
+    (position_slot << 25) | /* bits 30-25 */
+    (position_footer << 8) | /* bits 8-24 */
+    (match_len - MIN_MATCH); /* bits 0-7 */
+
+  if (match_len < (NUM_PRIMARY_LENGTHS + MIN_MATCH)) {
+    length_header = match_len - MIN_MATCH;
+    /*    length_footer = 255; */ /* not necessary */
+  }
+  else {
+    length_header = NUM_PRIMARY_LENGTHS;
+    length_footer = match_len - (NUM_PRIMARY_LENGTHS + MIN_MATCH);
+    lzud->length_freq_table[length_footer]++;
+  }
+  len_pos_header = (position_slot << 3) | length_header;
+  lzud->main_freq_table[len_pos_header + NUM_CHARS]++;
+  if (extra_bits[position_slot] >= 3) {
+    lzud->aligned_freq_table[position_footer & 7]++;
+  }
+#ifndef OLDFRAMING
+  lzud->left_in_block -= match_len;
+#endif
+  if (lzud->subdivide)
+    check_entropy(lzud, len_pos_header + NUM_CHARS);
+  return 0; /* accept the match */
+}
+
+static void 
+lzx_output_literal(lz_info *lzi, unsigned char ch)
+{
+  lzxc_data *lzud = (lzxc_data *)lzi->user_data;
+
+#ifndef OLDFRAMING
+  lzud->left_in_block--;
+#endif
+  *lzud->block_codesp++ = ch;
+#ifdef DEBUG_LZ
+  fprintf(stderr, "%c", ch);
+#endif
+  lzud->main_freq_table[ch]++;
+  if (lzud->subdivide)
+    check_entropy(lzud, ch);
+}
+
+static void lzx_write_bits(lzxc_data *lzxd, int nbits, uint32_t bits)
+{
+  int cur_bits;
+  int shift_bits;
+  int rshift_bits;
+  uint16_t mask_bits;
+
+#ifdef DEBUG_BITBUF
+  fprintf(stderr, "WB: %2d %08x\n", nbits, bits);
+#endif
+  cur_bits = lzxd->bits_in_buf;
+  while ((cur_bits + nbits) >= 16) {
+    shift_bits = 16 - cur_bits;
+    rshift_bits = nbits - shift_bits;
+    if (shift_bits == 16) {
+      lzxd->bit_buf = (bits>>rshift_bits) & 0xFFFF;
+    }
+    else {
+      mask_bits = (1U << shift_bits) - 1;
+      lzxd->bit_buf <<= shift_bits;
+      lzxd->bit_buf |= (bits>>rshift_bits) & mask_bits;
+    }
+#ifdef DEBUG_BITBUF
+    fprintf(stderr, "WBB: %04x\n", lzxd->bit_buf);
+#endif
+#ifdef LZX_BIG_ENDIAN
+    lzxd->bit_buf = ((lzxd->bit_buf & 0xFF)<<8) | (lzxd->bit_buf >> 8);
+#endif
+    lzxd->put_bytes(lzxd->out_arg, sizeof(lzxd->bit_buf), &lzxd->bit_buf);
+    lzxd->len_compressed_output += sizeof(lzxd->bit_buf);
+    lzxd->bit_buf = 0;
+    nbits -= shift_bits;
+    cur_bits = 0;
+  }
+  /* (cur_bits + nbits) < 16.  If nbits = 0, we're done. 
+     otherwise move bits in */
+  shift_bits = nbits;
+  mask_bits = (1U << shift_bits) - 1;
+  lzxd->bit_buf <<= shift_bits;
+  lzxd->bit_buf |= bits & mask_bits;
+  cur_bits += nbits;
+
+#ifdef DEBUG_BITBUF
+  fprintf(stderr, "OBB: %2d %04x\n", cur_bits, lzxd->bit_buf);
+#endif
+  lzxd->bits_in_buf = cur_bits;
+}
+
+static void lzx_align_output(lzxc_data *lzxd)
+{
+  if (lzxd->bits_in_buf) {
+    lzx_write_bits(lzxd, 16 - lzxd->bits_in_buf, 0);
+  }
+  if (lzxd->mark_frame)
+    lzxd->mark_frame(lzxd->mark_frame_arg, lzxd->len_uncompressed_input, lzxd->len_compressed_output);
+}
+
+static void
+lzx_write_compressed_literals(lzxc_data *lzxd, int block_type)
+{
+  uint32_t *cursor = lzxd->block_codes;
+  uint32_t *endp = lzxd->block_codesp;
+  uint16_t position_slot;
+  uint32_t position_footer;
+  uint32_t match_len_m2; /* match length minus 2, which is MIN_MATCH */
+  uint32_t verbatim_bits;
+  uint32_t block_code;
+  uint16_t length_header;
+  uint16_t length_footer;
+  uint16_t len_pos_header;
+  huff_entry *huffe;
+  int frame_count = (lzxd->len_uncompressed_input % LZX_FRAME_SIZE);
+
+  lzxd->len_uncompressed_input -= frame_count; /* will be added back in later */
+  while (cursor < endp) {
+    block_code = *cursor++;
+    if (block_code & 0x80000000) {
+      /*
+       *    0x80000000 |                bit 31 in intelligent bit ordering
+       * (position_slot << 25) |        bits 30-25
+       * (position_footer << 8) |       bits 8-24 
+       * (match_len - MIN_MATCH);       bits 0-7
+       *
+       */
+      
+      match_len_m2 = block_code & 0xFF; /* 8 bits */
+      position_footer = (block_code >> 8)& 0x1FFFF; /* 17 bits */
+      position_slot = (block_code >> 25) & 0x3F; /* 6 bits */
+
+#ifdef DEBUG_MATCHES_2
+      fprintf(stderr, "%08x, %3d %2d %d\n", lzxd->len_uncompressed_input + frame_count, match_len_m2, position_slot, position_footer);
+#endif      
+      if (match_len_m2 < NUM_PRIMARY_LENGTHS) {
+	length_header = match_len_m2;
+	length_footer = 255; /* personal encoding for NULL */
+      }
+      else {
+	length_header = NUM_PRIMARY_LENGTHS;
+	length_footer = match_len_m2 - NUM_PRIMARY_LENGTHS;
+      }
+      len_pos_header = (position_slot << 3) | length_header;
+      huffe = &lzxd->main_tree[len_pos_header+NUM_CHARS];
+      lzx_write_bits(lzxd, huffe->codelength, huffe->code);
+      if (length_footer != 255) {
+	huffe = &lzxd->length_tree[length_footer];
+	lzx_write_bits(lzxd, huffe->codelength, huffe->code);
+      }
+      if ((block_type == LZX_ALIGNED_OFFSET_BLOCK) && (extra_bits[position_slot] >= 3)) {
+	/* aligned offset block and code */
+	verbatim_bits = position_footer >> 3;
+	lzx_write_bits(lzxd, extra_bits[position_slot] - 3, verbatim_bits);
+	huffe = &lzxd->aligned_tree[position_footer&7];
+	lzx_write_bits(lzxd, huffe->codelength, huffe->code);
+      }
+      else {
+	verbatim_bits = position_footer;
+	lzx_write_bits(lzxd, extra_bits[position_slot], verbatim_bits);
+      }
+      frame_count += match_len_m2 + 2;
+    }
+    else {
+      /* literal */
+      assert(block_code < NUM_CHARS);
+      huffe = &lzxd->main_tree[block_code];
+      lzx_write_bits(lzxd, huffe->codelength, huffe->code);
+      frame_count++;
+    }
+    if (frame_count == LZX_FRAME_SIZE) {
+      lzxd->len_uncompressed_input += frame_count;
+      lzx_align_output(lzxd);
+      frame_count = 0;
+    }
+#ifdef DEBUG_MATCHES_2
+    if (frame_count > LZX_FRAME_SIZE) {
+      fprintf(stderr, "uncomp_len = %x, frame_count = %x, block_code = %08x, match_len_m2 = %d", lzxd->len_uncompressed_input, frame_count, block_code, match_len_m2);
+    }
+#endif
+    assert (frame_count < LZX_FRAME_SIZE);
+  }
+  lzxd->len_uncompressed_input += frame_count;
+}
+
+static int 
+lzx_write_compressed_tree(struct lzxc_data *lzxd,
+			  struct huff_entry *tree, uint8_t *prevlengths,
+			  int treesize)
+{
+  unsigned char *codes;
+  unsigned char *runs;
+  int freqs[LZX_PRETREE_SIZE];
+  int cur_run;
+  int last_len;
+  huff_entry pretree[20];
+  unsigned char *codep;
+  unsigned char *codee;
+  unsigned char *runp;
+  int excess;
+  int i;
+  int cur_code;
+
+  codep = codes = malloc(treesize*sizeof(char));
+  runp = runs = malloc(treesize*sizeof(char));
+  memset(freqs, 0, sizeof(freqs));
+  cur_run = 1;
+  last_len = tree[0].codelength;
+  for (i = 1; i <= treesize; i++) {
+    if ((i == treesize) || (tree[i].codelength != last_len)) {
+      if (last_len == 0) {
+	while (cur_run >= 20) {
+	  excess =  cur_run - 20;
+	  if (excess > 31) excess = 31;
+	  *codep++ = 18;
+	  *runp++ = excess;
+	  cur_run -= excess + 20;
+	  freqs[18]++;
+	}
+	while (cur_run >= 4) {
+	  excess =  cur_run - 4;
+	  if (excess > 15) excess = 15;
+	  *codep++ = 17;
+	  *runp++ = excess;
+	  cur_run -= excess + 4;
+	  freqs[17]++;
+	}
+	while (cur_run > 0) {
+	  *codep = prevlengths[i - cur_run];
+	  freqs[*codep++]++;
+	  *runp++ = 0; /* not necessary */
+	  cur_run--;
+	}
+      }
+      else {
+	while (cur_run >= 4) {
+	  if (cur_run == 4) excess = 0;
+	  else excess = 1;
+	  *codep++ = 19;
+	  *runp++ = excess;
+	  freqs[19]++;
+	  /* right, MS lies again.  Code is NOT 
+	     prev_len + len (mod 17), it's prev_len - len (mod 17)*/
+	  *codep = prevlengths[i-cur_run] - last_len;
+	  if (*codep > 16) *codep += 17;
+	  freqs[*codep++]++;
+	  *runp++ = 0; /* not necessary */
+	  cur_run -= excess+4;
+	}
+	while (cur_run > 0) {
+	  *codep = prevlengths[i-cur_run] - last_len;
+	  if (*codep > 16) *codep += 17;
+	  *runp++ = 0; /* not necessary */
+	  cur_run--;
+	  freqs[*codep++]++;
+	}
+      }
+      if (i != treesize)
+	last_len = tree[i].codelength;
+      cur_run = 0;
+    }
+    cur_run++;
+  }
+  codee = codep;
+#ifdef DEBUG_TREE_COMPRESSION
+  *codep++ = 255;
+  *runp++ = 255;
+  fprintf(stderr, "num:  len  code  run\n");
+  for (i = 0; i < treesize; i++) {
+    fprintf(stderr, "%3d:  %2d   %2d    %2d\n", i, tree[i].codelength, codes[i], runs[i]);
+  }
+#endif
+  /* now create the huffman table and write out the pretree */
+  build_huffman_tree(LZX_PRETREE_SIZE, 16, freqs, pretree);
+  for (i = 0; i < LZX_PRETREE_SIZE; i++) {
+    lzx_write_bits(lzxd, 4, pretree[i].codelength);
+  }
+  codep = codes;
+  runp = runs;
+  cur_run = 0;
+  while (codep < codee) {
+    cur_code = *codep++;
+    lzx_write_bits(lzxd, pretree[cur_code].codelength, pretree[cur_code].code);
+    if (cur_code == 17) {
+      cur_run += *runp + 4;
+      lzx_write_bits(lzxd, 4, *runp);
+    }
+    else if (cur_code == 18) {
+      cur_run += *runp + 20;
+      lzx_write_bits(lzxd, 5, *runp);
+    }
+    else if (cur_code == 19) {
+      cur_run += *runp + 4;
+      lzx_write_bits(lzxd, 1, *runp);
+      cur_code = *codep++;
+      lzx_write_bits(lzxd, pretree[cur_code].codelength, pretree[cur_code].code);
+      runp++;
+    }
+    else {
+      cur_run++;
+    }
+    runp++;
+  }
+  free(codes);
+  free(runs);
+  return 0;
+}
+
+void 
+lzxc_reset(lzxc_data *lzxd)
+{
+  lzxd->need_1bit_header = 1;
+  lzxd->R0 = lzxd->R1 = lzxd->R2 = 1;
+  memset(lzxd->prev_main_treelengths, 0, lzxd->main_tree_size * sizeof(uint8_t));
+  memset(lzxd->prev_length_treelengths, 0, NUM_SECONDARY_LENGTHS * sizeof(uint8_t));
+  lz_reset(lzxd->lzi);
+}
+
+int lzxc_compress_block(lzxc_data *lzxd, int block_size, int subdivide)
+{
+  int i;
+  uint32_t written_sofar = 0;
+  int block_type;
+  long uncomp_bits;
+  long comp_bits;
+  long comp_bits_ovh;
+  long uncomp_length;
+  
+  if ((lzxd->block_size != block_size) || (lzxd->block_codes == NULL)) {
+    if (lzxd->block_codes != NULL) free(lzxd->block_codes);
+    lzxd->block_size = block_size;
+    lzxd->block_codes =  malloc(block_size * sizeof(uint32_t));
+  }
+  lzxd->subdivide = subdivide?1:0;
+
+  lzxd->left_in_block = block_size;
+  lzxd->left_in_frame = LZX_FRAME_SIZE;
+  lzxd->main_entropy = 0.0;
+  lzxd->last_ratio = 9999999.0;
+  lzxd->block_codesp = lzxd->block_codes;
+
+  memset(lzxd->length_freq_table, 0, NUM_SECONDARY_LENGTHS * sizeof(int));
+  memset(lzxd->main_freq_table, 0, lzxd->main_tree_size * sizeof(int));
+  memset(lzxd->aligned_freq_table, 0, LZX_ALIGNED_SIZE * sizeof(int));
+  do {
+    lz_compress(lzxd->lzi, lzxd->left_in_block);
+    if (lzxd->left_in_frame == 0)
+      lzxd->left_in_frame = LZX_FRAME_SIZE;
+    
+    if ((lzxd->subdivide<0) || !lzxd->left_in_block || 
+	(!lz_left_to_process(lzxd->lzi) && lzxd->at_eof(lzxd->in_arg))) {
+      /* now one block is LZ-analyzed. */
+      /* time to write it out */
+      uncomp_length = lzxd->block_size - lzxd->left_in_block - written_sofar;
+      /* uncomp_length will sometimes be 0 when input length is 
+	 an exact multiple of frame size */
+      if (uncomp_length == 0)
+	  continue;
+      if (lzxd->subdivide < 0) {
+#ifdef DEBUG_ENTROPY
+	fprintf(stderr, "subdivided\n");
+#endif
+	lzxd->subdivide = 1;
+      }
+      
+      if (lzxd->need_1bit_header) {
+	/* one bit Intel preprocessing header */
+	/* always 0 because this implementation doesn't do Intel preprocessing */
+	lzx_write_bits(lzxd, 1, 0);
+	lzxd->need_1bit_header = 0;
+      }
+
+      /* handle extra bits */
+      uncomp_bits = comp_bits = 0;
+      build_huffman_tree(LZX_ALIGNED_SIZE, 7, lzxd->aligned_freq_table, lzxd->aligned_tree);
+      for (i = 0; i < LZX_ALIGNED_SIZE; i++) {
+	uncomp_bits += lzxd->aligned_freq_table[i]* 3;
+	comp_bits += lzxd->aligned_freq_table[i]* lzxd->aligned_tree[i].codelength;
+      }
+      comp_bits_ovh = comp_bits + LZX_ALIGNED_SIZE * 3;
+      if (comp_bits_ovh < uncomp_bits)
+      	block_type = LZX_ALIGNED_OFFSET_BLOCK;
+      else
+	block_type = LZX_VERBATIM_BLOCK;
+
+#ifdef DEBUG_EXTRA_BITS
+      fprintf(stderr, "Extra bits uncompressed: %5d  compressed:  %5d  compressed w/overhead %5d gain/loss %5d\n", uncomp_bits, comp_bits, comp_bits_ovh, uncomp_bits - comp_bits_ovh);
+#endif
+
+      /* block type */
+      lzx_write_bits(lzxd, 3, block_type);
+      /* uncompressed length */
+      lzx_write_bits(lzxd, 24, uncomp_length);
+
+      written_sofar = lzxd->block_size - lzxd->left_in_block;
+
+      /* now write out the aligned offset trees if present */
+      if (block_type == LZX_ALIGNED_OFFSET_BLOCK) {
+	for (i = 0; i < LZX_ALIGNED_SIZE; i++) {
+	  lzx_write_bits(lzxd, 3, lzxd->aligned_tree[i].codelength); 
+	}
+      }
+      /* end extra bits */
+      build_huffman_tree(lzxd->main_tree_size, LZX_MAX_CODE_LENGTH,
+			 lzxd->main_freq_table, lzxd->main_tree);
+      build_huffman_tree(NUM_SECONDARY_LENGTHS, 16, 
+			 lzxd->length_freq_table, lzxd->length_tree);
+
+
+
+      /* now write the pre-tree and tree for main 1 */
+      lzx_write_compressed_tree(lzxd, lzxd->main_tree, lzxd->prev_main_treelengths, NUM_CHARS);
+    
+      /* now write the pre-tree and tree for main 2*/
+      lzx_write_compressed_tree(lzxd, lzxd->main_tree + NUM_CHARS,
+				lzxd->prev_main_treelengths + NUM_CHARS,
+				lzxd->main_tree_size - NUM_CHARS);
+      
+      /* now write the pre tree and tree for length */
+      lzx_write_compressed_tree(lzxd, lzxd->length_tree, lzxd->prev_length_treelengths,
+				NUM_SECONDARY_LENGTHS);
+      
+      /* now write literals */
+      lzx_write_compressed_literals(lzxd, block_type);
+      
+      /* copy treelengths somewhere safe to do delta compression */
+      for (i = 0; i < lzxd->main_tree_size; i++) {
+	lzxd->prev_main_treelengths[i] = lzxd->main_tree[i].codelength;
+      }
+      for (i = 0; i < NUM_SECONDARY_LENGTHS; i++) {
+	lzxd->prev_length_treelengths[i] = lzxd->length_tree[i].codelength;
+      }
+      lzxd->main_entropy = 0.0;
+      lzxd->last_ratio = 9999999.0;
+      lzxd->block_codesp = lzxd->block_codes;
+      
+      memset(lzxd->length_freq_table, 0, NUM_SECONDARY_LENGTHS * sizeof(int));
+      memset(lzxd->main_freq_table, 0, lzxd->main_tree_size * sizeof(int));
+      memset(lzxd->aligned_freq_table, 0, LZX_ALIGNED_SIZE * sizeof(int));
+    }
+  }
+  while (lzxd->left_in_block && (lz_left_to_process(lzxd->lzi) || !lzxd->at_eof(lzxd->in_arg)));
+  return 0;
+}
+
+int lzxc_init(struct lzxc_data **lzxdp, int wsize_code, 
+	     lzxc_get_bytes_t get_bytes, void *get_bytes_arg,
+	     lzxc_at_eof_t at_eof,
+	     lzxc_put_bytes_t put_bytes, void *put_bytes_arg,
+	     lzxc_mark_frame_t mark_frame, void *mark_frame_arg)
+{
+  int wsize;
+  struct lzxc_data *lzxd;
+
+  if ((wsize_code < 15) || (wsize_code > 21)) {
+    return -1;
+  }
+  lzx_init_static();
+
+  *lzxdp = lzxd = malloc(sizeof(*lzxd));
+  if (lzxd == 0)
+    return -2;
+
+  lzxd->in_arg = get_bytes_arg;
+  lzxd->out_arg = put_bytes_arg;
+  lzxd->mark_frame_arg = mark_frame_arg;
+  lzxd->get_bytes = get_bytes;
+  lzxd->put_bytes = put_bytes;
+  lzxd->at_eof = at_eof;
+  lzxd->mark_frame = mark_frame;
+
+  wsize = 1 << (wsize_code);
+
+  lzxd->bits_in_buf = 0;
+  lzxd->block_size = 0;
+  lzxd->block_codes = NULL;
+  lzxd->num_position_slots = num_position_slots[wsize_code-15];
+  lzxd->main_tree_size = (NUM_CHARS + 8 * lzxd->num_position_slots);
+
+  lzxd->main_freq_table = malloc(sizeof(int) * lzxd->main_tree_size);
+  lzxd->main_tree = malloc(sizeof(huff_entry)* lzxd->main_tree_size);
+  lzxd->prev_main_treelengths = malloc(sizeof(uint8_t)*lzxd->main_tree_size);
+
+  lzxd->lzi = malloc(sizeof (*lzxd->lzi));
+  /* the -3 prevents matches at wsize, wsize-1, wsize-2, all of which are illegal */
+  lz_init(lzxd->lzi, wsize, wsize - 3, MAX_MATCH, MIN_MATCH, LZX_FRAME_SIZE,
+	  lzx_get_chars, lzx_output_match, lzx_output_literal,lzxd);
+  lzxd->len_uncompressed_input = 0;
+  lzxd->len_compressed_output = 0;
+  lzxc_reset(lzxd);
+  return 0;
+}
+
+int lzxc_finish(struct lzxc_data *lzxd, struct lzxc_results *lzxr)
+{
+  /*  lzx_align_output(lzxd);  Not needed as long as frame padding is in place */
+  if (lzxr) {
+    lzxr->len_compressed_output = lzxd->len_compressed_output;
+    lzxr->len_uncompressed_input = lzxd->len_uncompressed_input;
+  }
+  lz_release(lzxd->lzi);
+  free(lzxd->lzi);
+  free(lzxd->prev_main_treelengths);
+  free(lzxd->main_tree);
+  free(lzxd->main_freq_table);
+  if (lzxd->block_codes) {
+    free(lzxd->block_codes);
+  }
+  free(lzxd);
+  return 0;
+}
+
diff --git a/src/calibre/utils/lzx/lzxc.h b/src/calibre/utils/lzx/lzxc.h
new file mode 100644
index 0000000000..30da460a81
--- /dev/null
+++ b/src/calibre/utils/lzx/lzxc.h
@@ -0,0 +1,47 @@
+/*
+    File lzx_compress.h, part of lzxcomp library
+    Copyright (C) 2002 Matthew T. Russotto
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation; version 2.1 only
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifdef _MSC_VER
+#include "msstdint.h"
+#endif
+
+typedef struct lzxc_data lzxc_data;
+typedef int (*lzxc_get_bytes_t)(void *arg, int n, void *buf);
+typedef int (*lzxc_put_bytes_t)(void *arg, int n, void *buf);
+typedef void (*lzxc_mark_frame_t)(void *arg, uint32_t uncomp, uint32_t comp);
+typedef int (*lzxc_at_eof_t)(void *arg);
+
+typedef struct lzxc_results
+{
+  /* add more here? Error codes, # blocks, # frames, etc? */
+  long len_compressed_output;
+  long len_uncompressed_input;
+} lzxc_results;
+
+int lzxc_init(struct lzxc_data **lzxdp, int wsize_code, 
+	     lzxc_get_bytes_t get_bytes, void *get_bytes_arg,
+	     lzxc_at_eof_t at_eof,
+	     lzxc_put_bytes_t put_bytes, void *put_bytes_arg,
+	     lzxc_mark_frame_t mark_frame, void *mark_frame_arg);
+
+void lzxc_reset(lzxc_data *lzxd);
+
+int lzxc_compress_block(lzxc_data *lzxd, int block_size, int subdivide);
+
+int lzxc_finish(struct lzxc_data *lzxd, struct lzxc_results *lzxr);
+
diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c
index 337af441fd..e683a9ec23 100644
--- a/src/calibre/utils/lzx/lzxd.c
+++ b/src/calibre/utils/lzx/lzxd.c
@@ -18,7 +18,7 @@
 
 #include <mspack.h>
 #include <system.h>
-#include <lzx.h>
+#include <lzxd.h>
 
 /* Microsoft's LZX document and their implementation of the
  * com.ms.util.cab Java package do not concur.
diff --git a/src/calibre/utils/lzx/lzx.h b/src/calibre/utils/lzx/lzxd.h
similarity index 100%
rename from src/calibre/utils/lzx/lzx.h
rename to src/calibre/utils/lzx/lzxd.h
diff --git a/src/calibre/utils/lzx/lzxmodule.c b/src/calibre/utils/lzx/lzxmodule.c
index c45bb22c95..8b4b1f7c9b 100644
--- a/src/calibre/utils/lzx/lzxmodule.c
+++ b/src/calibre/utils/lzx/lzxmodule.c
@@ -4,25 +4,27 @@
  * Python module C glue code.
  */
 
-
 #include <Python.h>
 
 #include <mspack.h>
-#include <lzx.h>
+#include <lzxd.h>
+
+#include <lzxmodule.h>
 
 static char lzx_doc[] = 
-"Provide basic LZX decompression using the code from libmspack.";
+    "Provide basic LZX compression and decompression using the code from\n"
+    "liblzxcomp and libmspack respectively.";
 
-static PyObject *LzxError = NULL;
+PyObject *LZXError = NULL;
 
 typedef struct memory_file {
     unsigned int magic;	/* 0xB5 */
-    void * buffer;
+    void *buffer;
     int total_bytes;
     int current_bytes;
 } memory_file;
 
-void *
+static void *
 glue_alloc(struct mspack_system *this, size_t bytes)
 {
     void *p = NULL;
@@ -33,33 +35,33 @@ glue_alloc(struct mspack_system *this, size_t bytes)
     return p;
 }
 
-void
+static void
 glue_free(void *p)
 {
     free(p);
 }
 
-void
+static void
 glue_copy(void *src, void *dest, size_t bytes)
 {
     memcpy(dest, src, bytes);
 }
 
-struct mspack_file *
+static struct mspack_file *
 glue_open(struct mspack_system *this, char *filename, int mode)
 {
-    PyErr_SetString(LzxError, "MSPACK_OPEN unsupported");
+    PyErr_SetString(LZXError, "MSPACK_OPEN unsupported");
     return NULL;
 }
 
-void
+static void
 glue_close(struct mspack_file *file)
 {
     return;
 }
 
-int
-glue_read(struct mspack_file *file, void * buffer, int bytes)
+static int
+glue_read(struct mspack_file *file, void *buffer, int bytes)
 {
     memory_file *mem;
     int remaining;
@@ -76,8 +78,8 @@ glue_read(struct mspack_file *file, void * buffer, int bytes)
     return bytes;
 }
 
-int
-glue_write(struct mspack_file * file, void * buffer, int bytes)
+static int
+glue_write(struct mspack_file *file, void *buffer, int bytes)
 {
     memory_file *mem;
     int remaining;
@@ -86,9 +88,8 @@ glue_write(struct mspack_file * file, void * buffer, int bytes)
     if (mem->magic != 0xB5) return -1;
   
     remaining = mem->total_bytes - mem->current_bytes;
-    if (!remaining)  return 0;
     if (bytes > remaining) {
-        PyErr_SetString(LzxError,
+        PyErr_SetString(LZXError,
             "MSPACK_WRITE tried to write beyond end of buffer");
         bytes = remaining;
     }
@@ -188,7 +189,7 @@ decompress(PyObject *self, PyObject *args)
     if (err != MSPACK_ERR_OK) {
         Py_DECREF(retval);
         retval = NULL;
-        PyErr_SetString(LzxError, "LZX decompression failed");
+        PyErr_SetString(LZXError, "LZX decompression failed");
     }
     
     return retval;
@@ -198,7 +199,7 @@ static PyMethodDef lzx_methods[] = {
     { "init", &init, METH_VARARGS, "Initialize the LZX decompressor" },
     { "reset", &reset, METH_VARARGS, "Reset the LZX decompressor" },
     { "decompress", &decompress, METH_VARARGS, "Run the LZX decompressor" },
-    { NULL, NULL }
+    { NULL }
 };
 
 PyMODINIT_FUNC
@@ -206,14 +207,21 @@ initlzx(void)
 {
     PyObject *m;
 
+    if (PyType_Ready(&CompressorType) < 0) {
+        return;
+    }
+
     m = Py_InitModule3("lzx", lzx_methods, lzx_doc);
     if (m == NULL) {
         return;
     }
     
-    LzxError = PyErr_NewException("lzx.LzxError", NULL, NULL);
-    Py_INCREF(LzxError);
-    PyModule_AddObject(m, "LzxError", LzxError);
-    
+    LZXError = PyErr_NewException("lzx.LZXError", NULL, NULL);
+    Py_INCREF(LZXError);
+    PyModule_AddObject(m, "LZXError", LZXError);
+
+    Py_INCREF(&CompressorType);
+    PyModule_AddObject(m, "Compressor", (PyObject *)&CompressorType);
+
     return;
 }
diff --git a/src/calibre/utils/lzx/lzxmodule.h b/src/calibre/utils/lzx/lzxmodule.h
new file mode 100644
index 0000000000..d146694fd7
--- /dev/null
+++ b/src/calibre/utils/lzx/lzxmodule.h
@@ -0,0 +1,15 @@
+/* __license__   = 'GPL v3'
+ * __copyright__ = '2008, Marshall T. Vandegrift <llasram@gmail.com>'
+ *
+ * Common declarations for Python module C glue code.
+ */
+
+#include <Python.h>
+
+#ifndef LZXMODULE_H
+#define LZXMODULE_H
+
+extern PyObject *LZXError;
+extern PyTypeObject CompressorType;
+
+#endif /* LZXMODULE_H */
diff --git a/src/calibre/utils/lzx/msstdint.h b/src/calibre/utils/lzx/msstdint.h
new file mode 100644
index 0000000000..e032ff1605
--- /dev/null
+++ b/src/calibre/utils/lzx/msstdint.h
@@ -0,0 +1,232 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006-2008 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   extern "C++" {
+#endif 
+#     include <wchar.h>
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   }
+#endif
+
+// Define _W64 macros to mark types changing their size, like intptr_t.
+#ifndef _W64
+#  if !defined(__midl) && (defined(_X86_) || defined(_M_IX86)) && _MSC_VER >= 1300
+#     define _W64 __w64
+#  else
+#     define _W64
+#  endif
+#endif
+
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef __int64           intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef _W64 int               intptr_t;
+   typedef _W64 unsigned int      uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]
diff --git a/src/calibre/utils/msdes/spr.h b/src/calibre/utils/msdes/spr.h
index fdcf5e3e46..1579892575 100644
--- a/src/calibre/utils/msdes/spr.h
+++ b/src/calibre/utils/msdes/spr.h
@@ -1,60 +1,25 @@
-/* crypto/des/spr.h */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
+/*--[crypto/des/spr.h]---------------------------------------------------------
+ | Copyright (C) 2002 Dan A. Jackson 
+ |
+ | This file is part of the "openclit" library for processing .LIT files.
+ |
+ | "Openclit" is free software; you can redistribute it and/or modify
+ | it under the terms of the GNU General Public License as published by
+ | the Free Software Foundation; either version 2 of the License, or
+ | (at your option) any later version.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ | GNU General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License
+ | along with this program; if not, write to the Free Software
+ | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ | 
+ | The GNU General Public License may also be available at the following
+ | URL: http://www.gnu.org/licenses/gpl.html
+*/
 
 static unsigned long SP1[64] = {
 0x02080800L, 0x00080000L, 0x02000002L, 0x02080802L,
diff --git a/src/calibre/web/feeds/__init__.py b/src/calibre/web/feeds/__init__.py
index dffb9f8c56..3bc1110db9 100644
--- a/src/calibre/web/feeds/__init__.py
+++ b/src/calibre/web/feeds/__init__.py
@@ -9,6 +9,7 @@ import time, logging, traceback, copy
 from datetime import datetime
 
 from calibre.web.feeds.feedparser import parse
+from lxml import html
 
 class Article(object):
     
@@ -20,6 +21,18 @@ class Article(object):
         self.title = title.strip() if title else title
         self.url = url
         self.summary = summary
+        if summary and not isinstance(summary, unicode):
+            summary = summary.decode('utf-8', 'replace')
+        if summary and '<' in summary:
+            try:
+                s = html.fragment_fromstring(summary, create_parent=True)
+                summary = html.tostring(s, method='text', encoding=unicode)
+            except:
+                print 'Failed to process article summary, deleting:'
+                print summary.encode('utf-8')
+                traceback.print_exc()
+                summary = u''
+        self.text_summary = summary
         self.content = content
         self.date = published
         self.utctime = datetime(*self.date[:6])
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index 24fe30fa6f..15b42d442d 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -7,12 +7,18 @@ Defines various abstract base classes that can be subclassed to create powerful
 __docformat__ = "restructuredtext en"
 
 
-import logging, os, cStringIO, time, traceback, re, urlparse, sys
+import logging, os, cStringIO, time, traceback, re, urlparse, sys, tempfile, functools
 from collections import defaultdict
 from functools import partial
 from contextlib import nested, closing
 
-from calibre import browser, __appname__, iswindows, LoggingInterface, strftime
+from PyQt4.Qt import QApplication, QFile, Qt, QPalette, QSize, QImage, QPainter, \
+                     QBuffer, QByteArray, SIGNAL, QUrl, QEventLoop, QIODevice
+from PyQt4.QtWebKit import QWebPage
+
+
+from calibre import browser, __appname__, iswindows, LoggingInterface, \
+                    strftime, __version__, preferred_encoding
 from calibre.ebooks.BeautifulSoup import BeautifulSoup, NavigableString, CData, Tag
 from calibre.ebooks.metadata.opf import OPFCreator
 from calibre.ebooks.lrf import entity_to_unicode
@@ -23,6 +29,7 @@ from calibre.web.fetch.simple import option_parser as web2disk_option_parser
 from calibre.web.fetch.simple import RecursiveFetcher
 from calibre.utils.threadpool import WorkRequest, ThreadPool, NoResultsPending
 from calibre.ptempfile import PersistentTemporaryFile
+from calibre.gui2 import images_rc # Needed for default cover
 
 
 class BasicNewsRecipe(object, LoggingInterface):
@@ -335,9 +342,9 @@ class BasicNewsRecipe(object, LoggingInterface):
         It can be used to do arbitrarily powerful post-processing on the :term:`HTML`.
         It should return `soup` after processing it. 
         
-        :param soup: A `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_ 
-        instance containing the downloaded :term:`HTML`.
+        :param soup: A `BeautifulSoup <http://www.crummy.com/software/BeautifulSoup/documentation.html>`_  instance containing the downloaded :term:`HTML`.
         :param first_fetch: True if this is the first page of an article.
+
         '''
         return soup
     
@@ -586,9 +593,9 @@ class BasicNewsRecipe(object, LoggingInterface):
         if npos < 0:
             npos = pos
         ans = src[:npos+1]
-        if isinstance(ans, unicode):
-            return ans
-        return ans+u'\u2026' if isinstance(ans, unicode) else ans + '...'
+        if len(ans) < len(src):
+            return ans+u'\u2026' if isinstance(ans, unicode) else ans + '...'
+        return ans
 
         
     
@@ -766,6 +773,91 @@ class BasicNewsRecipe(object, LoggingInterface):
             self.cover_path = cpath
             
     
+    def default_cover(self, cover_file):
+        '''
+        Create a generic cover for recipes that dont have a cover
+        '''
+        if QApplication.instance() is None: QApplication([])
+        f = QFile(':/library')
+        f.open(QIODevice.ReadOnly)
+        img = str(f.readAll())
+        f.close()
+        f = tempfile.NamedTemporaryFile(suffix='library.png')
+        f.write(img)
+        f.flush()
+        img = f.name
+        html= u'''\
+        <html>
+            <head>
+                <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                <style type="text/css">
+                    body {
+                        background: white no-repeat fixed center center;
+                        text-align: center;
+                        vertical-align: center;
+                        overflow: hidden;
+                        font-size: 18px;
+                    }
+                    h1 { font-family: serif; }
+                    h2, h4 { font-family: monospace; }
+                </style>
+            </head>
+            <body>
+                <h1>%(title)s</h1>
+                <br/><br/>
+                <div style="position:relative">
+                    <div style="position: absolute; left: 0; top: 0; width:100%%; height:100%%; vertical-align:center">
+                        <img src="%(img)s" alt="calibre" style="opacity:0.3"/>
+                    </div>
+                    <div style="position: absolute; left: 0; top: 0; width:100%%; height:100%%; vertical-align:center">
+                        <h2>%(date)s</h2>
+                        <br/><br/><br/><br/><br/>
+                        <h3>%(author)s</h3>
+                        <br/><br/></br/><br/><br/><br/><br/><br/><br/>
+                        <h4>Produced by %(app)s</h4>
+                    </div>
+                </div>
+            </body>
+        </html>
+        '''%dict(title=self.title if isinstance(self.title, unicode) else self.title.decode(preferred_encoding, 'replace'), 
+                 author=self.__author__ if isinstance(self.__author__, unicode) else self.__author__.decode(preferred_encoding, 'replace'),
+                 date=strftime(self.timefmt), 
+                 app=__appname__ +' '+__version__,
+                 img=img)
+        f2 = tempfile.NamedTemporaryFile(suffix='cover.html')
+        f2.write(html.encode('utf-8'))
+        f2.flush()
+        page = QWebPage()
+        pal = page.palette()
+        pal.setBrush(QPalette.Background, Qt.white)
+        page.setPalette(pal)
+        page.setViewportSize(QSize(590, 750))
+        page.mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff)
+        page.mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
+        loop = QEventLoop()
+        def render_html(page, loop, ok):
+            try:
+                image = QImage(page.viewportSize(), QImage.Format_ARGB32)
+                image.setDotsPerMeterX(96*(100/2.54))
+                image.setDotsPerMeterY(96*(100/2.54))
+                painter = QPainter(image)
+                page.mainFrame().render(painter)
+                painter.end()
+                ba = QByteArray()
+                buf = QBuffer(ba)
+                buf.open(QBuffer.WriteOnly)
+                image.save(buf, 'JPEG')
+                image_data = str(ba.data())
+                cover_file.write(image_data)
+                cover_file.flush()
+            finally:
+                loop.exit(0)
+    
+        page.connect(page, SIGNAL('loadFinished(bool)'), functools.partial(render_html, page, loop))
+        page.mainFrame().load(QUrl.fromLocalFile(f2.name))
+        loop.exec_()
+
+    
     def create_opf(self, feeds, dir=None):
         if dir is None:
             dir = self.output_dir
@@ -778,7 +870,11 @@ class BasicNewsRecipe(object, LoggingInterface):
         
         manifest = [os.path.join(dir, 'feed_%d'%i) for i in range(len(feeds))]
         manifest.append(os.path.join(dir, 'index.html'))
-        cpath = getattr(self, 'cover_path', None) 
+        cpath = getattr(self, 'cover_path', None)
+        if cpath is None:
+            pf = PersistentTemporaryFile('_recipe_cover.jpg')
+            self.default_cover(pf)
+            cpath =  pf.name
         if cpath is not None and os.access(cpath, os.R_OK):
             opf.cover = cpath
             manifest.append(cpath)
diff --git a/src/calibre/web/feeds/recipes/__init__.py b/src/calibre/web/feeds/recipes/__init__.py
index 407a46d06f..4e45175832 100644
--- a/src/calibre/web/feeds/recipes/__init__.py
+++ b/src/calibre/web/feeds/recipes/__init__.py
@@ -4,20 +4,24 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
 '''
 Builtin recipes.
 '''
-recipe_modules = [
-           'newsweek', 'atlantic', 'economist', 'portfolio', 
+recipe_modules = ['recipe_' + r for r in (
+           'newsweek', 'atlantic', 'economist', 'portfolio',
            'nytimes', 'usatoday', 'outlook_india', 'bbc', 'greader', 'wsj',
            'wired', 'globe_and_mail', 'smh', 'espn', 'business_week',
            'ars_technica', 'upi', 'new_yorker', 'irish_times', 'iht', 'lanacion',
            'discover_magazine', 'scientific_american', 'new_york_review_of_books',
-           'daily_telegraph', 'guardian', 'el_pais', 'new_scientist', 'b92', 
+           'daily_telegraph', 'guardian', 'el_pais', 'new_scientist', 'b92',
            'politika', 'moscow_times', 'latimes', 'japan_times', 'san_fran_chronicle',
            'demorgen_be', 'de_standaard', 'ap', 'barrons', 'chr_mon', 'cnn', 'faznet',
            'jpost', 'jutarnji', 'nasa', 'reuters', 'spiegelde', 'wash_post', 'zeitde',
            'blic', 'novosti', 'danas', 'vreme', 'times_online', 'the_scotsman',
            'nytimes_sub', 'security_watch', 'cyberpresse', 'st_petersburg_times',
-           'clarin', 'financial_times', 'heise'
-          ]
+           'clarin', 'financial_times', 'heise', 'le_monde', 'harpers', 'science_aas',
+           'science_news', 'the_nation', 'lrb', 'harpers_full', 'liberation',
+           'linux_magazine', 'telegraph_uk', 'utne', 'sciencedaily', 'forbes',
+           'time_magazine', 'endgadget', 'fudzilla', 'nspm_int', 'nspm', 'pescanik',
+           'spiegel_int', 'themarketticker', 'tomshardware', 'xkcd', 'ftd', 'zdnet',
+          )]
 
 import re, imp, inspect, time, os
 from calibre.web.feeds.news import BasicNewsRecipe, CustomIndexRecipe, AutomaticNewsRecipe
@@ -58,7 +62,7 @@ def compile_recipe(src):
     Compile the code in src and return the first object that is a recipe or profile.
     @param src: Python source code
     @type src: string
-    @return: Recipe/Profile class or None, if no such class was found in C{src} 
+    @return: Recipe/Profile class or None, if no such class was found in C{src}
     '''
     global _tdir, _crep
     if _tdir is None or not os.path.exists(_tdir):
@@ -77,13 +81,13 @@ def compile_recipe(src):
     f.close()
     module = imp.find_module(temp.namebase, [temp.dirname()])
     module = imp.load_module(temp.namebase, *module)
-    classes = inspect.getmembers(module, 
+    classes = inspect.getmembers(module,
             lambda x : inspect.isclass(x) and \
                 issubclass(x, (DefaultProfile, BasicNewsRecipe)) and \
                 x not in basic_recipes)
     if not classes:
         return None
-    
+
     return classes[0][1]
 
 
@@ -92,7 +96,7 @@ def get_builtin_recipe(title):
     Return a builtin recipe/profile class whose title == C{title} or None if no such
     recipe exists. Also returns a flag that is True iff the found recipe is really
     an old-style Profile.
-    
+
     @type title: string
     @rtype: class or None, boolean
     '''
@@ -117,9 +121,9 @@ class BasicUserRecipe%d(AutomaticNewsRecipe):
     oldest_article = %d
     max_articles_per_feed = %d
     summary_length = %d
-    
+
     feeds = %s
-    
-'''%(int(time.time()), repr(profile.title), profile.oldest_article, 
+
+'''%(int(time.time()), repr(profile.title), profile.oldest_article,
     profile.max_articles_per_feed, profile.summary_length, repr(profile.feeds))
-    
+
diff --git a/src/calibre/web/feeds/recipes/b92.py b/src/calibre/web/feeds/recipes/b92.py
deleted file mode 100644
index 40496b0ef1..0000000000
--- a/src/calibre/web/feeds/recipes/b92.py
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
-'''
-b92.net
-'''
-import locale
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class B92(BasicNewsRecipe):
-    title                 = u'B92'
-    __author__            = 'Darko Miletic'
-    description           = 'Dnevne vesti iz Srbije i sveta'    
-    oldest_article        = 7
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    use_embedded_content  = False
-
-    remove_tags_after  = dict(name='div', attrs={'class':'gas'})
-    remove_tags = [
-                     dict(name='div'  , attrs={'class':'interaction clearfix' })
-                    ,dict(name='div'  , attrs={'class':'gas'                  })
-                    ,dict(name='ul'   , attrs={'class':'comment-nav'          })
-                    ,dict(name='table', attrs={'class':'pages-navigation-form'})
-                  ]
-
-    feeds          = [
-                        (u'Vesti'     , u'http://www.b92.net/info/rss/vesti.xml'     )
-                       ,(u'Kultura'   , u'http://www.b92.net/info/rss/kultura.xml'   )                      
-                       ,(u'Automobili', u'http://www.b92.net/info/rss/automobili.xml')                      
-                       ,(u'Zivot'     , u'http://www.b92.net/info/rss/zivot.xml'     )
-                       ,(u'Tehnopolis', u'http://www.b92.net/info/rss/tehnopolis.xml')
-                       ,(u'Biz'       , u'http://www.b92.net/info/rss/biz.xml'       )
-                     ]
-
-    def print_version(self, url):
-        return url + '&version=print'
diff --git a/src/calibre/web/feeds/recipes/blic.py b/src/calibre/web/feeds/recipes/blic.py
deleted file mode 100644
index 02683e7f88..0000000000
--- a/src/calibre/web/feeds/recipes/blic.py
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
-'''
-blic.rs
-'''
-import locale
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Blic(BasicNewsRecipe):
-    title                 = u'Blic'
-    __author__            = 'Darko Miletic'
-    description           = 'Vesti'    
-    oldest_article        = 7
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    use_embedded_content  = False
-    timefmt               = ' [%A, %d %B, %Y]' 
-
-    keep_only_tags = [ dict(name='div', attrs={'class':'single_news'}) ]
-
-    feeds          = [ (u'Vesti', u'http://www.blic.rs/rssall.php')]
-
-    def print_version(self, url):
-        start_url, question, rest_url = url.partition('?')
-        return u'http://www.blic.rs/_print.php?' + rest_url
diff --git a/src/calibre/web/feeds/recipes/danas.py b/src/calibre/web/feeds/recipes/danas.py
deleted file mode 100644
index 0d5839e9d3..0000000000
--- a/src/calibre/web/feeds/recipes/danas.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
-'''
-danas.rs
-'''
-import locale
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Danas(BasicNewsRecipe):
-    title                 = u'Danas'
-    __author__            = 'Darko Miletic'
-    description           = 'Vesti'    
-    oldest_article        = 7
-    max_articles_per_feed = 100
-    no_stylesheets        = False
-    use_embedded_content  = False
-    timefmt               = ' [%A, %d %B, %Y]' 
-
-    keep_only_tags     = [ dict(name='div', attrs={'id':'left'}) ]
-    remove_tags_after  = dict(name='div', attrs={'id':'comments'})
-    remove_tags = [
-                     dict(name='div', attrs={'class':'width_1_4'})
-                    ,dict(name='div', attrs={'class':'metaClanka'})
-                    ,dict(name='div', attrs={'id':'comments'})
-                    ,dict(name='div', attrs={'class':'baner'})
-                  ]
-
-
-
-    feeds          = [ (u'Vesti', u'http://www.danas.rs/rss/rss.asp')]
-
-#    def print_version(self, url):
-#        return url + '&action=print'
diff --git a/src/calibre/web/feeds/recipes/jutarnji.py b/src/calibre/web/feeds/recipes/jutarnji.py
deleted file mode 100644
index 062242429d..0000000000
--- a/src/calibre/web/feeds/recipes/jutarnji.py
+++ /dev/null
@@ -1,45 +0,0 @@
-'''
-	Profile to download Jutarnji.hr by Valloric
-'''
-
-import re
-	
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Jutarnji(BasicNewsRecipe):
-
-	title = 'Jutarnji'
-	description = 'News from Croatia'
-	__author__ = 'Valloric'
-	use_embedded_content   = False
-	timefmt  = ' [%d %b %Y]'
-	max_articles_per_feed = 80
-	html_description = True
-	no_stylesheets = True
-
-	preprocess_regexps = [
-		(re.compile(r'<body.*?<span class="vijestnaslov">', re.IGNORECASE | re.DOTALL), lambda match : '<body><span class="vijestnaslov">'), 
-		(re.compile(r'</div>.*?</td>', re.IGNORECASE | re.DOTALL), lambda match : '</div></td>'), 
-   		(re.compile(r'<a name="addComment.*?</body>', re.IGNORECASE | re.DOTALL), lambda match : '</body>'), 
-		(re.compile(r'<br>', re.IGNORECASE | re.DOTALL), lambda match : ''), 
-		]
-	
-	## Getting the print version 
-	
-	def print_version(self, url):
-		return 'http://www.jutarnji.hr/ispis_clanka.jl?artid=' + url[len(url)-9:len(url)-3]
-
-	
-	## Comment out the feeds you don't want retrieved.
-	## Or add any new new RSS feed URL's here, sorted alphabetically when converted to LRF
-	## If you want one of these at the top, append a space in front of the name.
-	
-	feeds =  [
-                (' Naslovnica', 'http://www.jutarnji.hr/rss'), 
-                ('Sport', 'http://www.jutarnji.hr/sport/rss'), 
-                ('Novac', 'http://www.jutarnji.hr/novac/rss'), 
-                ('Kultura i zivot', 'http://www.jutarnji.hr/kultura_i_zivot/rss'), 
-                ('Automoto', 'http://www.jutarnji.hr/auto_moto/rss'), 
-                ('Hi-Tech', 'http://www.jutarnji.hr/kultura_i_zivot/hi-tech/rss'), 
-                ('Dom i nekretnine', 'http://www.jutarnji.hr/nekretnine/rss'), 
-                ]
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/new_yorker.py b/src/calibre/web/feeds/recipes/new_yorker.py
deleted file mode 100644
index ed9811c43b..0000000000
--- a/src/calibre/web/feeds/recipes/new_yorker.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env  python
-__license__   = 'GPL v3'
-__copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
-__docformat__ = 'restructuredtext en'
-
-import re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import NavigableString
-
-class NewYorker(BasicNewsRecipe):
-    
-    title       = 'The New Yorker'
-    __author__  = 'Kovid Goyal'
-    description = 'News and opinion'
-    
-    remove_tags = [
-                   dict(name='div', id=['printoptions', 'header', 'articleBottom']),
-                   dict(name='div', attrs={'class':['utils', 'icons']})
-                   ]
-    
-    
-    def parse_index(self):
-        toc_pat = re.compile(r'/magazine/toc/\d+/\d+/\d+/toc_\d+')
-        soup = self.soup(self.browser.open('http://www.newyorker.com/').read())
-        a = soup.find('a', href=toc_pat)
-        if a is None:
-            raise Exception('Could not find the current issue of The New Yorker')
-        href = a['href']
-        href = 'http://www.newyorker.com'+href[href.index('/magazine'):]
-        soup = self.soup(self.browser.open(href).read())
-        img = soup.find(id='inThisIssuePhoto')
-        if img is not None:
-            self.cover_url = 'http://www.newyorker.com'+img['src']
-            alt = img.get('alt', None)
-            if alt:
-                self.timefmt = ' [%s]'%alt
-        features = soup.findAll(attrs={'class':re.compile('feature')})
-        
-        category, sections, articles = None, [], []
-        for feature in features:
-            head = feature.find('img', alt=True, attrs={'class':'featurehed'})
-            if head is None:
-                continue
-            if articles:
-                sections.append((category, articles))
-            category, articles = head['alt'], []
-            if category in ('', 'AUDIO', 'VIDEO', 'BLOGS', 'GOINGS ON'):
-                continue
-            
-            for a in feature.findAll('a', href=True):
-                href = 'http://www.newyorker.com'+a['href']+'?printable=true'
-                title, in_title, desc = '', True, ''
-                for tag in a.contents:
-                    if getattr(tag, 'name', None) == 'br':
-                        in_title = False
-                        continue
-                    if isinstance(tag, NavigableString):
-                        text = unicode(tag)
-                        if in_title:
-                            title += text
-                        else:
-                            desc += text
-                if title and not 'Audio:' in title:
-                    art = {
-                           'title': title,
-                           'desc': desc, 'content':'',
-                           'url': href,
-                           'date': strftime('%a, %d %b'),
-                           }
-                    articles.append(art)
-                
-#        from IPython.Shell import IPShellEmbed
-#        ipshell = IPShellEmbed()
-#        ipshell()
-#        raise Exception()
-
-        return sections
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/novosti.py b/src/calibre/web/feeds/recipes/novosti.py
deleted file mode 100644
index e0b2b47352..0000000000
--- a/src/calibre/web/feeds/recipes/novosti.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
-'''
-novosti.rs
-'''
-import locale
-from calibre.web.feeds.news import BasicNewsRecipe
-
-class Novosti(BasicNewsRecipe):
-    title                 = u'Vecernje Novosti'
-    __author__            = u'Darko Miletic'
-    description           = u'Vesti'
-    oldest_article        = 7
-    max_articles_per_feed = 100
-    no_stylesheets        = True
-    use_embedded_content  = False
-    timefmt               = ' [%A, %d %B, %Y]' 
-
-    keep_only_tags     = [ dict(name='div', attrs={'class':'jednaVest'}) ]
-    remove_tags_after  = dict(name='div', attrs={'class':'info_bottom'})
-    remove_tags = [
-                     dict(name='div', attrs={'class':'info'})
-                    ,dict(name='div', attrs={'class':'info_bottom'})
-                  ]
-
-    feeds          = [ (u'Vesti', u'http://www.novosti.rs/php/vesti/rss.php')]
diff --git a/src/calibre/web/feeds/recipes/ap.py b/src/calibre/web/feeds/recipes/recipe_ap.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/ap.py
rename to src/calibre/web/feeds/recipes/recipe_ap.py
diff --git a/src/calibre/web/feeds/recipes/ars_technica.py b/src/calibre/web/feeds/recipes/recipe_ars_technica.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/ars_technica.py
rename to src/calibre/web/feeds/recipes/recipe_ars_technica.py
diff --git a/src/calibre/web/feeds/recipes/atlantic.py b/src/calibre/web/feeds/recipes/recipe_atlantic.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/atlantic.py
rename to src/calibre/web/feeds/recipes/recipe_atlantic.py
diff --git a/src/calibre/web/feeds/recipes/recipe_b92.py b/src/calibre/web/feeds/recipes/recipe_b92.py
new file mode 100644
index 0000000000..47d264af1c
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_b92.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+b92.net
+'''
+
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class B92(BasicNewsRecipe):
+    title                 = u'B92'
+    __author__            = 'Darko Miletic'
+    description           = 'Dnevne vesti iz Srbije i sveta'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    cover_url = 'http://static.b92.net/images/fp/logo.gif'
+    keep_only_tags = [ dict(name='div', attrs={'class':'sama_vest'}) ]
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Serbia'
+                        , '--publisher', 'B92'
+                        ]
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    feeds          = [
+                        (u'Vesti', u'http://www.b92.net/info/rss/vesti.xml')
+                       ,(u'Biz'  , u'http://www.b92.net/info/rss/biz.xml'  )
+                       ,(u'Zivot', u'http://www.b92.net/info/rss/zivot.xml')
+                       ,(u'Sport', u'http://www.b92.net/info/rss/sport.xml')
+                     ]
+
+    def print_version(self, url):
+        main, sep, article_id = url.partition('nav_id=')
+        rmain, rsep, rrest = main.partition('.php?')
+        mrmain , rsepp, nnt = rmain.rpartition('/')
+        mprmain, rrsep, news_type = mrmain.rpartition('/')
+        nurl = 'http://www.b92.net/mobilni/' + news_type + '/index.php?nav_id=' + article_id
+        brbiz, biz, bizrest = rmain.partition('/biz/')
+        if biz:
+            nurl = 'http://www.b92.net/mobilni/biz/index.php?nav_id=' + article_id
+        return nurl
diff --git a/src/calibre/web/feeds/recipes/barrons.py b/src/calibre/web/feeds/recipes/recipe_barrons.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/barrons.py
rename to src/calibre/web/feeds/recipes/recipe_barrons.py
diff --git a/src/calibre/web/feeds/recipes/bbc.py b/src/calibre/web/feeds/recipes/recipe_bbc.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/bbc.py
rename to src/calibre/web/feeds/recipes/recipe_bbc.py
diff --git a/src/calibre/web/feeds/recipes/recipe_blic.py b/src/calibre/web/feeds/recipes/recipe_blic.py
new file mode 100644
index 0000000000..bee95b8424
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_blic.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+blic.rs
+'''
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Blic(BasicNewsRecipe):
+    title                 = u'Blic'
+    __author__            = 'Darko Miletic'
+    description           = 'Blic.rs online verzija najtiraznije novine u Srbiji donosi najnovije vesti iz Srbije i sveta, komentare, politicke analize, poslovne i ekonomske vesti, vesti iz regiona, intervjue, informacije iz kulture, reportaze, pokriva sve sportske dogadjaje, detaljan tv program, nagradne igre, zabavu, fenomenalni Blic strip, dnevni horoskop, arhivu svih dogadjaja'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    cover_url = 'http://www.blic.rs/resources/images/header_back_tile.png'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Serbia'
+                        , '--publisher', 'Blic'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    keep_only_tags = [ dict(name='div', attrs={'class':'single_news'}) ]
+
+    feeds          = [ (u'Vesti', u'http://www.blic.rs/rssall.php')]
+
+    def print_version(self, url):
+        start_url, question, rest_url = url.partition('?')
+        return u'http://www.blic.rs/_print.php?' + rest_url
diff --git a/src/calibre/web/feeds/recipes/business_week.py b/src/calibre/web/feeds/recipes/recipe_business_week.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/business_week.py
rename to src/calibre/web/feeds/recipes/recipe_business_week.py
diff --git a/src/calibre/web/feeds/recipes/chr_mon.py b/src/calibre/web/feeds/recipes/recipe_chr_mon.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/chr_mon.py
rename to src/calibre/web/feeds/recipes/recipe_chr_mon.py
diff --git a/src/calibre/web/feeds/recipes/clarin.py b/src/calibre/web/feeds/recipes/recipe_clarin.py
similarity index 80%
rename from src/calibre/web/feeds/recipes/clarin.py
rename to src/calibre/web/feeds/recipes/recipe_clarin.py
index e4f3c4b501..7dda99a08d 100644
--- a/src/calibre/web/feeds/recipes/clarin.py
+++ b/src/calibre/web/feeds/recipes/recipe_clarin.py
@@ -9,14 +9,19 @@ clarin.com
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Clarin(BasicNewsRecipe):
-    title                 = u'Clarin'
+    title                 = 'Clarin'
     __author__            = 'Darko Miletic'
     description           = 'Noticias de Argentina y mundo'
     oldest_article        = 2
     max_articles_per_feed = 100
     use_embedded_content  = False
-    simultaneous_downloads = 1
-    delay = 1
+    cover_url = 'http://www.clarin.com/shared/v10/img/Hd/lg_Clarin.gif'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Argentina'
+                        , '--publisher', 'Grupo Clarin'
+                        ]
     
     remove_tags = [
                      dict(name='a'   , attrs={'class':'Imp'   })
diff --git a/src/calibre/web/feeds/recipes/cnn.py b/src/calibre/web/feeds/recipes/recipe_cnn.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/cnn.py
rename to src/calibre/web/feeds/recipes/recipe_cnn.py
diff --git a/src/calibre/web/feeds/recipes/cyberpresse.py b/src/calibre/web/feeds/recipes/recipe_cyberpresse.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/cyberpresse.py
rename to src/calibre/web/feeds/recipes/recipe_cyberpresse.py
diff --git a/src/calibre/web/feeds/recipes/daily_telegraph.py b/src/calibre/web/feeds/recipes/recipe_daily_telegraph.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/daily_telegraph.py
rename to src/calibre/web/feeds/recipes/recipe_daily_telegraph.py
diff --git a/src/calibre/web/feeds/recipes/recipe_danas.py b/src/calibre/web/feeds/recipes/recipe_danas.py
new file mode 100644
index 0000000000..54f75b8ad2
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_danas.py
@@ -0,0 +1,41 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+danas.rs
+'''
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Danas(BasicNewsRecipe):
+    title                 = 'Danas'
+    __author__            = 'Darko Miletic'
+    description           = 'Dnevne novine sa vestima iz sveta, politike, ekonomije, kulture, sporta, Beograda, Novog Sada i cele Srbije.'    
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    cover_url = 'http://www.danas.rs/images/basic/danas.gif'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Serbia'
+                        , '--publisher', 'Danas'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    keep_only_tags     = [ dict(name='div', attrs={'id':'left'}) ]
+    remove_tags = [
+                     dict(name='div', attrs={'class':'width_1_4'  })
+                    ,dict(name='div', attrs={'class':'metaClanka' })
+                    ,dict(name='div', attrs={'id':'comments'      })
+                    ,dict(name='div', attrs={'class':'baner'      })
+                    ,dict(name='div', attrs={'class':'slikaClanka'})                    
+                  ]
+
+    feeds          = [(u'Vesti', u'http://www.danas.rs/rss/rss.asp')]
+
+    def print_version(self, url):
+        return url + '&action=print'
diff --git a/src/calibre/web/feeds/recipes/de_standaard.py b/src/calibre/web/feeds/recipes/recipe_de_standaard.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/de_standaard.py
rename to src/calibre/web/feeds/recipes/recipe_de_standaard.py
diff --git a/src/calibre/web/feeds/recipes/demorgen_be.py b/src/calibre/web/feeds/recipes/recipe_demorgen_be.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/demorgen_be.py
rename to src/calibre/web/feeds/recipes/recipe_demorgen_be.py
diff --git a/src/calibre/web/feeds/recipes/discover_magazine.py b/src/calibre/web/feeds/recipes/recipe_discover_magazine.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/discover_magazine.py
rename to src/calibre/web/feeds/recipes/recipe_discover_magazine.py
diff --git a/src/calibre/web/feeds/recipes/economist.py b/src/calibre/web/feeds/recipes/recipe_economist.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/economist.py
rename to src/calibre/web/feeds/recipes/recipe_economist.py
diff --git a/src/calibre/web/feeds/recipes/el_pais.py b/src/calibre/web/feeds/recipes/recipe_el_pais.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/el_pais.py
rename to src/calibre/web/feeds/recipes/recipe_el_pais.py
diff --git a/src/calibre/web/feeds/recipes/recipe_endgadget.py b/src/calibre/web/feeds/recipes/recipe_endgadget.py
new file mode 100644
index 0000000000..7593d2578e
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_endgadget.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+engadget.com
+'''
+
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Engadget(BasicNewsRecipe):
+    title                 = u'Engadget'
+    __author__            = 'Darko Miletic'
+    description           = 'Tech news'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+
+    keep_only_tags     = [ dict(name='div', attrs={'class':'post'}) ]
+    remove_tags = [
+                      dict(name='object')
+                     ,dict(name='div', attrs={'class':'postmeta'})
+                     ,dict(name='div', attrs={'class':'quigoads'})
+                  ]
+
+
+    feeds = [ (u'Posts', u'http://www.engadget.com/rss.xml')]
+
diff --git a/src/calibre/web/feeds/recipes/espn.py b/src/calibre/web/feeds/recipes/recipe_espn.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/espn.py
rename to src/calibre/web/feeds/recipes/recipe_espn.py
diff --git a/src/calibre/web/feeds/recipes/faznet.py b/src/calibre/web/feeds/recipes/recipe_faznet.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/faznet.py
rename to src/calibre/web/feeds/recipes/recipe_faznet.py
diff --git a/src/calibre/web/feeds/recipes/financial_times.py b/src/calibre/web/feeds/recipes/recipe_financial_times.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/financial_times.py
rename to src/calibre/web/feeds/recipes/recipe_financial_times.py
diff --git a/src/calibre/web/feeds/recipes/recipe_forbes.py b/src/calibre/web/feeds/recipes/recipe_forbes.py
new file mode 100644
index 0000000000..9fa281fa09
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_forbes.py
@@ -0,0 +1,37 @@
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Forbes(BasicNewsRecipe):
+    title          = u'Forbes'
+    description    = 'Business and Financial News'
+    __author__     = 'Darko Miletic'
+    oldest_article = 30
+    max_articles_per_feed = 100
+    no_stylesheets = True
+    html2lrf_options = ['--base-font-size', '10']     
+
+    cover_url  = u'http://www.forbes.com/media/current_covers/forbes_120_160.gif'
+    
+    feeds          = [(u'Latest', u'http://www.forbes.com/news/index.xml'), 
+        (u'Most Popular', u'http://www.forbes.com/feeds/popstories.xml'), 
+        (u'Most Emailed', u'http://www.forbes.com/feeds/mostemailed.xml'), 
+        (u'Faces', u'http://www.forbes.com/facesscan/index.xml'), 
+        (u'Technology', u'http://www.forbes.com/technology/index.xml'), 
+        (u'Personal Tech', u'http://www.forbes.com/personaltech/index.xml'), 
+        (u'Wireless', u'http://www.forbes.com/wireless/index.xml'),
+        (u'Business', u'http://www.forbes.com/business/index.xml'), 
+        (u'Sports Money', u'http://www.forbes.com/sportsmoney/index.xml'), 
+        (u'Sports', u'http://www.forbes.com/forbeslife/sports/index.xml'),
+        (u'Vehicles', u'http://www.forbes.com/forbeslife/vehicles/index.xml'),
+        (u'Leadership', u'http://www.forbes.com/leadership/index.xml'), 
+        (u'Careers', u'http://www.forbes.com/leadership/careers/index.xml'),
+        (u'Compensation', u'http://www.forbes.com/leadership/compensation/index.xml'),
+        (u'Managing', u'http://www.forbes.com/leadership/managing/index.xml')]
+
+    def print_version(self, url):
+        raw = self.browser.open(url).read()
+        soup = BeautifulSoup(raw.decode('latin1', 'replace'))
+        print_link = soup.find('a', {'onclick':"s_linkTrackVars='prop18';s_linkType='o';s_linkName='Print';if(typeof(globalPageName)!='undefined')s_prop18=globalPageName;s_lnk=s_co(this);s_gs(s_account);"})
+        if print_link is None:
+            return ''
+        return 'http://www.forbes.com' + print_link['href']
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/recipe_ftd.py b/src/calibre/web/feeds/recipes/recipe_ftd.py
new file mode 100644
index 0000000000..b2c0a8ef50
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_ftd.py
@@ -0,0 +1,49 @@
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+'''
+Fetch FTD.
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class FTheiseDe(BasicNewsRecipe):
+    
+    title = 'FTD'
+    description = 'Financial Times Deutschland'
+    __author__ = 'Oliver Niesner'
+    use_embedded_content   = False
+    timefmt = ' [%d %b %Y]'
+    max_articles_per_feed = 40
+    no_stylesheets = True
+    
+    remove_tags = [dict(id='navi_top'),
+		   dict(id='topbanner'),
+		   dict(id='seitenkopf'),
+		   dict(id='footer'),
+		   dict(id='rating_open'),
+		   dict(id='ADS_Top'),
+		   dict(id='ADS_Middle1'),
+		   #dict(id='IDMS_ajax_chart_price_information_table'),
+		   dict(id='ivwimg'),
+		   dict(name='span', attrs={'class':'rsaquo'}),
+		   dict(name='p', attrs={'class':'zwischenhead'}),
+		   dict(name='div', attrs={'class':'chartBox'}),
+		   dict(name='span', attrs={'class':'vote_455857'}),
+		   dict(name='div', attrs={'class':'relatedhalb'}),
+		   dict(name='div', attrs={'class':'bpoll'}),
+		   dict(name='div', attrs={'class':'pollokknopf'}),
+		   dict(name='div', attrs={'class':'videohint'}),
+		   dict(name='div', attrs={'class':'videoshadow'}),
+		   dict(name='div', attrs={'class':'boxresp videorahmen'}),
+		   dict(name='div', attrs={'class':'boxresp'}),
+		   dict(name='div', attrs={'class':'abspielen'}),
+		   dict(name='div', attrs={'class':'wertungoben'}),
+		   dict(name='div', attrs={'class':'artikelfuss'}),
+		   dict(name='div', attrs={'class':'artikelsplitfaq'})]
+    remove_tags_after = [dict(name='div', attrs={'class':'artikelfuss'})]
+    
+    feeds =  [ ('FTD', 'http://www.ftd.de/static/ticker/ftd-topnews.rdf') ] 
+    
+
diff --git a/src/calibre/web/feeds/recipes/recipe_fudzilla.py b/src/calibre/web/feeds/recipes/recipe_fudzilla.py
new file mode 100644
index 0000000000..eda7b6451a
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_fudzilla.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+fudzilla.com
+'''
+
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Fudzilla(BasicNewsRecipe):
+    title                 = u'Fudzilla'
+    __author__            = 'Darko Miletic'
+    description           = 'Tech news'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+
+    feeds = [ (u'Posts', u'http://www.fudzilla.com/index.php?option=com_rss&feed=RSS2.0&no_html=1')]
+
+    def print_version(self, url):
+        nurl = url.replace('http://www.fudzilla.com/index.php','http://www.fudzilla.com/index2.php')
+        nmain, nsep, nrest = nurl.partition('&Itemid=')
+        return  nmain + '&pop=1&page=0&Itemid=1'
diff --git a/src/calibre/web/feeds/recipes/globe_and_mail.py b/src/calibre/web/feeds/recipes/recipe_globe_and_mail.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/globe_and_mail.py
rename to src/calibre/web/feeds/recipes/recipe_globe_and_mail.py
diff --git a/src/calibre/web/feeds/recipes/greader.py b/src/calibre/web/feeds/recipes/recipe_greader.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/greader.py
rename to src/calibre/web/feeds/recipes/recipe_greader.py
diff --git a/src/calibre/web/feeds/recipes/guardian.py b/src/calibre/web/feeds/recipes/recipe_guardian.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/guardian.py
rename to src/calibre/web/feeds/recipes/recipe_guardian.py
diff --git a/src/calibre/web/feeds/recipes/recipe_harpers.py b/src/calibre/web/feeds/recipes/recipe_harpers.py
new file mode 100644
index 0000000000..7649f6bd9b
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_harpers.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+harpers.org
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Harpers(BasicNewsRecipe):
+    title                 = u"Harper's Magazine"
+    __author__            = u'Darko Miletic'
+    description           = u"Harper's Magazine: Founded June 1850."
+    oldest_article        = 30
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    timefmt               = ' [%A, %d %B, %Y]' 
+
+    keep_only_tags = [ dict(name='div', attrs={'id':'cached'}) ]
+    remove_tags = [
+                     dict(name='table', attrs={'class':'rcnt'})
+                    ,dict(name='table', attrs={'class':'rcnt topline'})
+                  ]
+
+    feeds       = [
+                   (u"Harper's Magazine", u'http://www.harpers.org/rss/frontpage-rss20.xml')
+                   ]
diff --git a/src/calibre/web/feeds/recipes/recipe_harpers_full.py b/src/calibre/web/feeds/recipes/recipe_harpers_full.py
new file mode 100644
index 0000000000..c87faf195a
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_harpers_full.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+harpers.org - paid subscription/ printed issue articles
+This recipe only get's article's published in text format
+images and pdf's are ignored
+'''
+
+from calibre import strftime
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Harpers_full(BasicNewsRecipe):
+    title                 = u"Harper's Magazine - articles from printed edition"
+    __author__            = u'Darko Miletic'
+    description           = u"Harper's Magazine: Founded June 1850."
+    oldest_article        = 30
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    simultaneous_downloads = 1
+    delay = 1
+    needs_subscription = True
+    INDEX = strftime('http://www.harpers.org/archive/%Y/%m')
+    LOGIN = 'http://www.harpers.org'
+    cover_url = strftime('http://www.harpers.org/media/pages/%Y/%m/gif/0001.gif')
+
+    keep_only_tags = [ dict(name='div', attrs={'id':'cached'}) ]
+    remove_tags = [
+                     dict(name='table', attrs={'class':'rcnt'})
+                    ,dict(name='table', attrs={'class':'rcnt topline'})
+                  ]
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        if self.username is not None and self.password is not None:
+            br.open(self.LOGIN)
+            br.select_form(nr=1)
+            br['handle'  ] = self.username
+            br['password'] = self.password
+            br.submit()
+        return br
+        
+    def parse_index(self):
+        articles = []
+        print 'Processing ' + self.INDEX
+        soup = self.index_to_soup(self.INDEX)
+        for item in soup.findAll('div', attrs={'class':'title'}):
+            text_link = item.parent.find('img',attrs={'alt':'Text'})            
+            if text_link:
+                url   = self.LOGIN + item.a['href']
+                title = item.a.contents[0]
+                date  = strftime(' %B %Y')
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date
+                                 ,'url'        :url
+                                 ,'description':''
+                                })
+        return [(soup.head.title.string, articles)]
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/heise.py b/src/calibre/web/feeds/recipes/recipe_heise.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/heise.py
rename to src/calibre/web/feeds/recipes/recipe_heise.py
diff --git a/src/calibre/web/feeds/recipes/iht.py b/src/calibre/web/feeds/recipes/recipe_iht.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/iht.py
rename to src/calibre/web/feeds/recipes/recipe_iht.py
diff --git a/src/calibre/web/feeds/recipes/irish_times.py b/src/calibre/web/feeds/recipes/recipe_irish_times.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/irish_times.py
rename to src/calibre/web/feeds/recipes/recipe_irish_times.py
diff --git a/src/calibre/web/feeds/recipes/japan_times.py b/src/calibre/web/feeds/recipes/recipe_japan_times.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/japan_times.py
rename to src/calibre/web/feeds/recipes/recipe_japan_times.py
diff --git a/src/calibre/web/feeds/recipes/jpost.py b/src/calibre/web/feeds/recipes/recipe_jpost.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/jpost.py
rename to src/calibre/web/feeds/recipes/recipe_jpost.py
diff --git a/src/calibre/web/feeds/recipes/recipe_jutarnji.py b/src/calibre/web/feeds/recipes/recipe_jutarnji.py
new file mode 100644
index 0000000000..f2504a78c1
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_jutarnji.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+jutarnji.hr
+'''
+
+import string, re
+from calibre.web.feeds.news import BasicNewsRecipe
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+
+class Jutarnji(BasicNewsRecipe):
+    title                 = 'Jutarnji'
+    __author__            = 'Darko Miletic'
+    description           = 'Online izdanje Jutarnjeg lista'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    simultaneous_downloads = 1
+    delay = 1    
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'cp1250'
+    cover_url = 'http://www.jutarnji.hr/EPHResources/Images/2008/06/05/jhrlogo.png'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Croatia'
+                        , '--publisher', 'Europapress holding d.o.o.'
+                        ]    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    remove_tags = [ 
+                    dict(name='embed')
+                   ,dict(name='a', attrs={'class':'a11'})
+                   ,dict(name='hr')
+                  ]
+    
+    feeds = [
+              (u'Naslovnica'      , u'http://www.jutarnji.hr/rss'           )
+             ,(u'Sport'           , u'http://www.jutarnji.hr/sport/rss'     )
+             ,(u'Jutarnji2'       , u'http://www.jutarnji.hr/j2/rss'        )
+             ,(u'Kultura'         , u'http://www.jutarnji.hr/kultura/rss'   )
+             ,(u'Spektakli'       , u'http://www.jutarnji.hr/spektakli/rss' )
+             ,(u'Dom i nekretnine', u'http://www.jutarnji.hr/nekretnine/rss')
+             ,(u'Uhvati ritam'    , u'http://www.jutarnji.hr/kalendar/rss'  )
+            ]
+
+    def print_version(self, url):
+        main, split, rest = url.partition('.jl')
+        rmain, rsplit, rrest = main.rpartition(',')
+        return u'http://www.jutarnji.hr/ispis_clanka.jl?artid=' + rrest
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        soup.head.insert(0,mtag)
+        soup.prettify()
+        return soup
+        
\ No newline at end of file
diff --git a/src/calibre/web/feeds/recipes/lanacion.py b/src/calibre/web/feeds/recipes/recipe_lanacion.py
similarity index 73%
rename from src/calibre/web/feeds/recipes/lanacion.py
rename to src/calibre/web/feeds/recipes/recipe_lanacion.py
index 0dddb05b72..58d7672116 100644
--- a/src/calibre/web/feeds/recipes/lanacion.py
+++ b/src/calibre/web/feeds/recipes/recipe_lanacion.py
@@ -9,13 +9,20 @@ lanacion.com.ar
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Lanacion(BasicNewsRecipe):
-    title                 = u'La Nacion'
+    title                 = 'La Nacion'
     __author__            = 'Darko Miletic'
-    description           = 'Noticias de Argentina y el resto del mundo'    
-    oldest_article        = 7
+    description           = 'Informacion actualizada las 24 horas, con noticias de Argentina y del mundo - Informate ya!'    
+    oldest_article        = 2
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
+    
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Argentina'
+                        , '--publisher', 'La Nacion SA'
+                        ]    
 
     keep_only_tags = [dict(name='div', attrs={'class':'nota floatFix'})]
     remove_tags = [
@@ -38,3 +45,12 @@ class Lanacion(BasicNewsRecipe):
                         ,(u'Ciencia/Salud'        , u'http://www.lanacion.com.ar/herramientas/rss/index.asp?categoria_id=498' )
                         ,(u'Revista'              , u'http://www.lanacion.com.ar/herramientas/rss/index.asp?categoria_id=494' )
                      ]
+
+    def get_cover_url(self):
+        index = 'http://www.lanacion.com.ar'
+        cover_url = None
+        soup = self.index_to_soup(index)
+        cover_item = soup.find('img',attrs={'class':'logo'})
+        if cover_item:
+           cover_url = index + cover_item['src']
+        return cover_url
diff --git a/src/calibre/web/feeds/recipes/latimes.py b/src/calibre/web/feeds/recipes/recipe_latimes.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/latimes.py
rename to src/calibre/web/feeds/recipes/recipe_latimes.py
diff --git a/src/calibre/web/feeds/recipes/recipe_le_monde.py b/src/calibre/web/feeds/recipes/recipe_le_monde.py
new file mode 100644
index 0000000000..d3ba64f18d
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_le_monde.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Mathieu Godlewski <mathieu at godlewski.fr>'
+'''
+lemonde.fr
+'''
+
+import re
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+
+class LeMonde(BasicNewsRecipe):
+    title          = 'LeMonde.fr'
+    __author__ = 'Mathieu Godlewski <mathieu at godlewski.fr>'
+    description = 'Global news in french'
+    oldest_article = 7
+    max_articles_per_feed = 20
+    no_stylesheets = True
+
+    feeds =  [
+             ('A la Une', 'http://www.lemonde.fr/rss/une.xml'),
+             ('International', 'http://www.lemonde.fr/rss/sequence/0,2-3210,1-0,0.xml'),
+             ('Europe', 'http://www.lemonde.fr/rss/sequence/0,2-3214,1-0,0.xml'),
+             ('Societe', 'http://www.lemonde.fr/rss/sequence/0,2-3224,1-0,0.xml'),
+             ('Economie', 'http://www.lemonde.fr/rss/sequence/0,2-3234,1-0,0.xml'),
+             ('Medias', 'http://www.lemonde.fr/rss/sequence/0,2-3236,1-0,0.xml'),
+             ('Rendez-vous', 'http://www.lemonde.fr/rss/sequence/0,2-3238,1-0,0.xml'),
+             ('Sports', 'http://www.lemonde.fr/rss/sequence/0,2-3242,1-0,0.xml'),
+             ('Planete', 'http://www.lemonde.fr/rss/sequence/0,2-3244,1-0,0.xml'),
+             ('Culture', 'http://www.lemonde.fr/rss/sequence/0,2-3246,1-0,0.xml'),
+             ('Technologies', 'http://www.lemonde.fr/rss/sequence/0,2-651865,1-0,0.xml'),
+             ('Cinema', 'http://www.lemonde.fr/rss/sequence/0,2-3476,1-0,0.xml'),
+             ('Voyages', 'http://www.lemonde.fr/rss/sequence/0,2-3546,1-0,0.xml'),
+             ('Livres', 'http://www.lemonde.fr/rss/sequence/0,2-3260,1-0,0.xml'),
+             ('Examens', 'http://www.lemonde.fr/rss/sequence/0,2-3404,1-0,0.xml'),
+             ('Opinions', 'http://www.lemonde.fr/rss/sequence/0,2-3232,1-0,0.xml')
+             ]
+
+    remove_tags    = [dict(name='img', attrs={'src':'http://medias.lemonde.fr/mmpub/img/lgo/lemondefr_pet.gif'}),
+                                    dict(name='div', attrs={'id':'xiti-logo-noscript'}),
+                                    dict(name='br', attrs={}),
+                                    dict(name='iframe', attrs={}),
+    ]
+
+    extra_css      = '.ar-tit {font-size: x-large;} \n .dt {font-size: x-small;}'
+
+    filter_regexps = [r'xiti\.com']
+
+    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
+        [
+            (r'<p>&nbsp;</p>', lambda match : ''),
+            (r'<img src="http://medias\.lemonde\.fr/mmpub/img/let/(.)\.gif"[^>]*><div class=ar-txt>', lambda match : '<div class=ar-txt>'+match.group(1).upper()),
+            (r'(<div class=desc><b>.*</b></div>).*</body>', lambda match : match.group(1)),
+        ]
+    ]
+
+    def print_version(self, url):
+        return re.sub('http:.*_([0-9]+)_[0-9]+\.html.*','http://www.lemonde.fr/web/imprimer_element/0,40-0,50-\\1,0.html' ,url)
+
diff --git a/src/calibre/web/feeds/recipes/recipe_liberation.py b/src/calibre/web/feeds/recipes/recipe_liberation.py
new file mode 100644
index 0000000000..9f85433d11
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_liberation.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+liberation.fr
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Liberation(BasicNewsRecipe):
+    title                 = u'Liberation'
+    __author__            = 'Darko Miletic'
+    description           = 'News from France'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    
+    html2lrf_options = ['--base-font-size', '10']
+
+    keep_only_tags    = [
+                           dict(name='h1')
+                          ,dict(name='div', attrs={'class':'articleContent'})
+                          ,dict(name='div', attrs={'class':'entry'})
+                        ]
+    remove_tags    = [
+                        dict(name='p', attrs={'class':'clear'})
+                       ,dict(name='ul', attrs={'class':'floatLeft clear'})
+                       ,dict(name='div', attrs={'class':'clear floatRight'})
+                       ,dict(name='object')
+                     ]
+    
+    feeds          = [
+                         (u'La une', u'http://www.liberation.fr/rss/laune')
+                        ,(u'Monde' , u'http://www.liberation.fr/rss/monde')
+                        ,(u'Sports', u'http://www.liberation.fr/rss/sports')
+                     ]
diff --git a/src/calibre/web/feeds/recipes/recipe_linux_magazine.py b/src/calibre/web/feeds/recipes/recipe_linux_magazine.py
new file mode 100644
index 0000000000..8b6d6ba81f
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_linux_magazine.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+linux-magazine.com
+'''
+
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LinuxMagazine(BasicNewsRecipe):
+    title                 = u'Linux Magazine'
+    __author__            = 'Darko Miletic'
+    description           = 'Linux news'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+
+    remove_tags_after = dict(name='div', attrs={'class':'end_intro'})
+    remove_tags = [
+                     dict(name='div' , attrs={'class':'end_intro' })
+                    ,dict(name='table'  , attrs={'width':'100%'})
+                  ]
+
+    feeds          = [(u'Linux Magazine Full Feed', u'http://www.linux-magazine.com/rss/feed/lmi_full')]
+        
+    def print_version(self, url):
+        raw = self.browser.open(url).read()
+        soup = BeautifulSoup(raw.decode('utf8', 'replace'))
+        print_link = soup.find('a', {'title':'Print this page'})
+        if print_link is None:
+            return url
+        return 'http://www.linux-magazine.com'+print_link['href']
+    
diff --git a/src/calibre/web/feeds/recipes/recipe_lrb.py b/src/calibre/web/feeds/recipes/recipe_lrb.py
new file mode 100644
index 0000000000..a31e4a32e7
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_lrb.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+lrb.co.uk
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LondonReviewOfBooks(BasicNewsRecipe):
+    title                 = u'London Review of Books'
+    __author__            = u'Darko Miletic'
+    description           = u'Literary review publishing essay-length book reviews and topical articles on politics, literature, history, philosophy, science and the arts by leading writers and thinkers'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'cp1252'
+    
+    remove_tags = [
+                    dict(name='div' , attrs={'id'   :'otherarticles'})
+                   ,dict(name='div' , attrs={'class':'pagetools'    })
+                   ,dict(name='div' , attrs={'id'   :'mainmenu'     })
+                   ,dict(name='div' , attrs={'id'   :'precontent'   })
+                   ,dict(name='div' , attrs={'class':'nocss'        })
+                   ,dict(name='span', attrs={'class':'inlineright'  })
+                  ]
+    
+    feeds = [(u'London Review of Books', u'http://www.lrb.co.uk/lrbrss.xml')]
+
+    def print_version(self, url):
+        main, split, rest = url.rpartition('/')
+        return main + '/print/' + rest
diff --git a/src/calibre/web/feeds/recipes/moscow_times.py b/src/calibre/web/feeds/recipes/recipe_moscow_times.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/moscow_times.py
rename to src/calibre/web/feeds/recipes/recipe_moscow_times.py
diff --git a/src/calibre/web/feeds/recipes/nasa.py b/src/calibre/web/feeds/recipes/recipe_nasa.py
similarity index 84%
rename from src/calibre/web/feeds/recipes/nasa.py
rename to src/calibre/web/feeds/recipes/recipe_nasa.py
index e36c73db72..06bf82ca37 100644
--- a/src/calibre/web/feeds/recipes/nasa.py
+++ b/src/calibre/web/feeds/recipes/recipe_nasa.py
@@ -53,13 +53,12 @@ class NASA(BasicNewsRecipe):
 		(r'<a.*?onclick.*?>.*?(<img .*?>)', lambda match: match.group(1),),
 		
 		## This removes header and footer information from each print version.
-       	(re.compile(r'<!-- Top Header starts -->.*?<!-- Body starts -->', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
-		(re.compile(r'<hr align="center" width="200"><p align="center">.*?<!-- Press Release standard text ends -->', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
-		(re.compile(r'<!-- Top Header starts -->.*?<!---->', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
+       	(r'<!-- Top Header starts -->.*?<!-- Body starts -->', lambda match : '<New Stuff>'),
+		(r'<hr align="center" width="200"><p align="center">.*?<!-- Press Release standard text ends -->', lambda match : '<New Stuff>'),
+		(r'<!-- Top Header starts -->.*?<!---->', lambda match : '<New Stuff>'),
 		
 		## This removes the "download image" of various sizes from the Image of the day.
-		(re.compile(r'<div id="download_image_box_print">.*?<div id="caption_region_print">', re.IGNORECASE | re.DOTALL), lambda match : '<New Stuff>'),
-
+		(r'<div id="download_image_box_print">.*?<div id="caption_region_print">', lambda match : '<New Stuff>'),
 
 		]
 	]
diff --git a/src/calibre/web/feeds/recipes/new_scientist.py b/src/calibre/web/feeds/recipes/recipe_new_scientist.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/new_scientist.py
rename to src/calibre/web/feeds/recipes/recipe_new_scientist.py
diff --git a/src/calibre/web/feeds/recipes/new_york_review_of_books.py b/src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/new_york_review_of_books.py
rename to src/calibre/web/feeds/recipes/recipe_new_york_review_of_books.py
diff --git a/src/calibre/web/feeds/recipes/recipe_new_yorker.py b/src/calibre/web/feeds/recipes/recipe_new_yorker.py
new file mode 100644
index 0000000000..f5ce85b351
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_new_yorker.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+newyorker.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class NewYorker(BasicNewsRecipe):
+    title                 = u'The New Yorker'
+    __author__            = 'Darko Miletic'
+    description           = 'Best of the US journalism'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = False
+    use_embedded_content  = False
+
+    keep_only_tags = [
+                        dict(name='div'  , attrs={'id':'printbody'   })
+                     ]
+    remove_tags = [
+                     dict(name='div'  , attrs={'class':'utils'       })
+                    ,dict(name='div'  , attrs={'id':'bottomFeatures' })
+                    ,dict(name='div'  , attrs={'id':'articleBottom'  })
+                  ]
+
+    feeds          = [
+                        (u'The New Yorker', u'http://feeds.newyorker.com/services/rss/feeds/everything.xml')
+                     ]
+
+    def print_version(self, url):
+        return url + '?printable=true'
diff --git a/src/calibre/web/feeds/recipes/newsweek.py b/src/calibre/web/feeds/recipes/recipe_newsweek.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/newsweek.py
rename to src/calibre/web/feeds/recipes/recipe_newsweek.py
diff --git a/src/calibre/web/feeds/recipes/recipe_novosti.py b/src/calibre/web/feeds/recipes/recipe_novosti.py
new file mode 100644
index 0000000000..4ff225fd0a
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_novosti.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+novosti.rs
+'''
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Novosti(BasicNewsRecipe):
+    title                 = 'Vecernje Novosti'
+    __author__            = 'Darko Miletic'
+    description           = 'novosti, vesti, politika, dosije, drustvo, ekonomija, hronika, reportaze, svet, kultura, sport, beograd, regioni, mozaik, feljton, intrvju, pjer, fudbal, kosarka, podvig, arhiva, komentari, kolumne, srbija, republika srpska,Vecernje novosti'
+    oldest_article        = 2
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Serbia'
+                        , '--publisher', 'Novosti AD'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    keep_only_tags     = [ dict(name='div', attrs={'class':'jednaVest'}) ]
+    remove_tags_after  = dict(name='div', attrs={'class':'info_bottom'})
+    remove_tags = [
+                     dict(name='div', attrs={'class':'info'})
+                    ,dict(name='div', attrs={'class':'info_bottom'})
+                  ]
+
+    feeds          = [ (u'Vesti', u'http://www.novosti.rs/php/vesti/rss.php')]
diff --git a/src/calibre/web/feeds/recipes/recipe_nspm.py b/src/calibre/web/feeds/recipes/recipe_nspm.py
new file mode 100644
index 0000000000..b06df23a75
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_nspm.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+nspm.rs
+'''
+
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Nspm(BasicNewsRecipe):
+    title                 = u'Nova srpska politicka misao'
+    __author__            = 'Darko Miletic'
+    description           = 'Casopis za politicku teoriju i drustvena istrazivanja'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    INDEX                 = 'http://www.nspm.rs/?alphabet=l'
+    cover_url = 'http://nspm.rs/templates/jsn_epic_pro/images/logol.jpg'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, politics, Serbia'
+                        , '--publisher', 'IIC NSPM'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        br.open(self.INDEX)
+        return br
+
+    feeds = [ (u'Nova srpska politicka misao', u'http://www.nspm.rs/feed/rss.html')]
+
+    def print_version(self, url):
+        return url.replace('.html','/stampa.html')
diff --git a/src/calibre/web/feeds/recipes/recipe_nspm_int.py b/src/calibre/web/feeds/recipes/recipe_nspm_int.py
new file mode 100644
index 0000000000..b474a5e2a9
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_nspm_int.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+nspm.rs/nspm-in-english
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Nspm_int(BasicNewsRecipe):
+    title                 = 'NSPM in English'
+    __author__            = 'Darko Miletic'
+    description           = 'Magazine dedicated to political theory and sociological research'        
+    oldest_article        = 20
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    INDEX                 = 'http://www.nspm.rs/?alphabet=l'
+    cover_url = 'http://nspm.rs/templates/jsn_epic_pro/images/logol.jpg'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, politics, Serbia, english'
+                        , '--publisher', 'IIC NSPM'
+                        ]
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        br.open(self.INDEX)
+        return br
+
+
+    keep_only_tags = [dict(name='div', attrs={'id':'jsn-mainbody'})]
+    remove_tags    = [dict(name='div', attrs={'id':'yvComment'   })]
+
+    feeds = [ (u'NSPM in English', u'http://nspm.rs/nspm-in-english/feed/rss.html')]
diff --git a/src/calibre/web/feeds/recipes/nytimes.py b/src/calibre/web/feeds/recipes/recipe_nytimes.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/nytimes.py
rename to src/calibre/web/feeds/recipes/recipe_nytimes.py
diff --git a/src/calibre/web/feeds/recipes/nytimes_sub.py b/src/calibre/web/feeds/recipes/recipe_nytimes_sub.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/nytimes_sub.py
rename to src/calibre/web/feeds/recipes/recipe_nytimes_sub.py
diff --git a/src/calibre/web/feeds/recipes/outlook_india.py b/src/calibre/web/feeds/recipes/recipe_outlook_india.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/outlook_india.py
rename to src/calibre/web/feeds/recipes/recipe_outlook_india.py
diff --git a/src/calibre/web/feeds/recipes/recipe_pescanik.py b/src/calibre/web/feeds/recipes/recipe_pescanik.py
new file mode 100644
index 0000000000..04d7d88803
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_pescanik.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+pescanik.net
+'''
+
+import string,re
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Pescanik(BasicNewsRecipe):
+    title                 = 'Pescanik'
+    __author__            = 'Darko Miletic'
+    description           = 'Pescanik'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    html2lrf_options = ['--base-font-size', '10']
+    html2epub_options = 'base_font_size = "10pt"'
+    
+    cover_url = "http://pescanik.net/templates/ja_teline/images/logo.png"
+    
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+    
+    remove_tags_after = dict(name='div', attrs={'class':'article_seperator'})
+    
+    remove_tags = [dict(name='td'  , attrs={'class':'buttonheading'})]
+
+    feeds       = [(u'Pescanik Online', u'http://pescanik.net/index.php?option=com_rd_rss&id=12')]
+
+    def print_version(self, url):
+        nurl = url.replace('http://pescanik.net/index.php','http://pescanik.net/index2.php')        
+        return nurl + '&pop=1&page=0'
diff --git a/src/calibre/web/feeds/recipes/politika.py b/src/calibre/web/feeds/recipes/recipe_politika.py
similarity index 70%
rename from src/calibre/web/feeds/recipes/politika.py
rename to src/calibre/web/feeds/recipes/recipe_politika.py
index fc2bc24abc..949a9b781d 100644
--- a/src/calibre/web/feeds/recipes/politika.py
+++ b/src/calibre/web/feeds/recipes/recipe_politika.py
@@ -5,26 +5,34 @@ __copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
 '''
 politika.rs
 '''
-import locale
+import string,re
 from calibre.web.feeds.news import BasicNewsRecipe
 
 class Politika(BasicNewsRecipe):
-    title                 = u'Politika Online'
+    title                 = 'Politika Online'
     __author__            = 'Darko Miletic'
     description           = 'Najstariji dnevni list na Balkanu'    
-    oldest_article        = 7
+    oldest_article        = 2
     max_articles_per_feed = 100
     no_stylesheets        = True
     extra_css             = '.content_center_border {text-align: left;}' 
     use_embedded_content  = False
-    timefmt               = ' [%A, %d %B, %Y]' 
-    remove_tags_before = dict(name='div', attrs={'class':'content_center_border'})
+    cover_url = 'http://www.politika.rs:8080/images/politika.gif'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, Serbia'
+                        , '--publisher', 'POLITIKA NOVINE I MAGAZINI d.o.o.'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    keep_only_tags     = [ dict(name='div', attrs={'class':'contentcenter'}) ] 
     remove_tags_after  = dict(name='div', attrs={'class':'datum_item_details'})
 
     feeds          = [  
                          (u'Politika'             , u'http://www.politika.rs/rubrike/Politika/index.1.lt.xml'             )
                         ,(u'Svet'                 , u'http://www.politika.rs/rubrike/Svet/index.1.lt.xml'                 )
-                        ,(u'Redakcijski komentari', u'http://www.politika.rs/rubrike/redakcijski-komentari/index.1.lt.xml')
                         ,(u'Pogledi'              , u'http://www.politika.rs/pogledi/index.lt.xml'                        )
                         ,(u'Pogledi sa strane'    , u'http://www.politika.rs/rubrike/Pogledi-sa-strane/index.1.lt.xml'    )
                         ,(u'Tema dana'            , u'http://www.politika.rs/rubrike/tema-dana/index.1.lt.xml'            )
diff --git a/src/calibre/web/feeds/recipes/portfolio.py b/src/calibre/web/feeds/recipes/recipe_portfolio.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/portfolio.py
rename to src/calibre/web/feeds/recipes/recipe_portfolio.py
diff --git a/src/calibre/web/feeds/recipes/reuters.py b/src/calibre/web/feeds/recipes/recipe_reuters.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/reuters.py
rename to src/calibre/web/feeds/recipes/recipe_reuters.py
diff --git a/src/calibre/web/feeds/recipes/san_fran_chronicle.py b/src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/san_fran_chronicle.py
rename to src/calibre/web/feeds/recipes/recipe_san_fran_chronicle.py
diff --git a/src/calibre/web/feeds/recipes/recipe_science_aas.py b/src/calibre/web/feeds/recipes/recipe_science_aas.py
new file mode 100644
index 0000000000..0ff14afacd
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_science_aas.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+sciencemag.org
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ScienceAAS(BasicNewsRecipe):
+    title                 = u'Science AAAS'
+    __author__            = u'Darko Miletic'
+    description           = u'The best in science news, commentary, and research'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    simultaneous_downloads = 1
+    delay                  = 1
+    timefmt                = ' [%A, %d %B, %Y]'
+    needs_subscription     = True
+    LOGIN = 'http://www.sciencemag.org/cgi/login?uri=%2Findex.dtl'
+         
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        if self.username is not None and self.password is not None:
+            br.open(self.LOGIN)
+            br.select_form(name='registered_users_form')
+            br['username'] = self.username
+            br['code'    ] = self.password
+            br.submit()
+        return br
+
+    keep_only_tags = [ dict(name='div', attrs={'id':'LegacyContent'}) ]
+
+    feeds       = [(u"Science: Current Issue", u'http://www.sciencemag.org/rss/current.xml')]
diff --git a/src/calibre/web/feeds/recipes/recipe_science_news.py b/src/calibre/web/feeds/recipes/recipe_science_news.py
new file mode 100644
index 0000000000..1ec29a69c6
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_science_news.py
@@ -0,0 +1,27 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+sciencenews.org
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Sciencenews(BasicNewsRecipe):
+    title                 = u'ScienceNews'
+    __author__            = u'Darko Miletic'
+    description           = u"Science News is an award-winning weekly newsmagazine covering the most important research in all fields of science. Its 16 pages each week are packed with short, accurate articles that appeal to both general readers and scientists. Published since 1922, the magazine now reaches about 150,000 subscribers and more than 1 million readers. These are the latest News Items from Science News."
+    oldest_article        = 30
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    timefmt               = ' [%A, %d %B, %Y]' 
+
+    keep_only_tags = [ dict(name='div', attrs={'id':'column_action'}) ]
+    remove_tags_after = dict(name='ul', attrs={'id':'content_functions_bottom'})
+    remove_tags = [
+                     dict(name='ul', attrs={'id':'content_functions_bottom'})
+                    ,dict(name='div', attrs={'id':'content_functions_top'})
+                  ]
+
+    feeds       = [(u"Science News / News Items", u'http://sciencenews.org/view/feed/type/news/name/news.rss')]
diff --git a/src/calibre/web/feeds/recipes/recipe_sciencedaily.py b/src/calibre/web/feeds/recipes/recipe_sciencedaily.py
new file mode 100644
index 0000000000..2b26de79c8
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_sciencedaily.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+sciencedaily.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ScienceDaily(BasicNewsRecipe):
+    title                 = u'ScienceDaily'
+    __author__            = u'Darko Miletic'
+    description           = u"Breaking science news and articles on global warming, extrasolar planets, stem cells, bird flu, autism, nanotechnology, dinosaurs, evolution -- the latest discoveries in astronomy, anthropology, biology, chemistry, climate &amp; environment, computers, engineering, health &amp; medicine, math, physics, psychology, technology, and more -- from the world's leading universities and research organizations."
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    
+    cover_url = 'http://www.sciencedaily.com/images/logo.gif'
+    
+    keep_only_tags = [ 
+                        dict(name='h1', attrs={'class':'story'}) 
+                       ,dict(name='div', attrs={'id':'story'}) 
+                     ]
+                     
+    remove_tags_after = dict(name='div', attrs={'id':'citationbox'})
+    remove_tags = [
+                     dict(name='div', attrs={'id':'seealso'})
+                    ,dict(name='div', attrs={'id':'citationbox'})
+                  ]
+    
+    feeds       = [(u"ScienceDaily", u'http://www.sciencedaily.com/newsfeed.xml')]
diff --git a/src/calibre/web/feeds/recipes/scientific_american.py b/src/calibre/web/feeds/recipes/recipe_scientific_american.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/scientific_american.py
rename to src/calibre/web/feeds/recipes/recipe_scientific_american.py
diff --git a/src/calibre/web/feeds/recipes/security_watch.py b/src/calibre/web/feeds/recipes/recipe_security_watch.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/security_watch.py
rename to src/calibre/web/feeds/recipes/recipe_security_watch.py
diff --git a/src/calibre/web/feeds/recipes/smh.py b/src/calibre/web/feeds/recipes/recipe_smh.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/smh.py
rename to src/calibre/web/feeds/recipes/recipe_smh.py
diff --git a/src/calibre/web/feeds/recipes/recipe_spiegel_int.py b/src/calibre/web/feeds/recipes/recipe_spiegel_int.py
new file mode 100644
index 0000000000..7ee8a9f258
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_spiegel_int.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+spiegel.de
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Spiegel_int(BasicNewsRecipe):
+    title                 = u'Spiegel Online International'
+    __author__            = 'Darko Miletic'
+    description           = "News and POV from Europe's largest newsmagazine"
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    cover_url = 'http://www.spiegel.de/static/sys/v8/headlines/spiegelonline.gif'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, politics, Germany'
+                        , '--publisher', 'SPIEGEL ONLINE GmbH'
+                        ]
+
+    remove_tags_after = dict(name='div', attrs={'id':'spArticleBody'})
+
+    feeds          = [(u'Spiegel Online', u'http://www.spiegel.de/schlagzeilen/rss/0,5291,676,00.xml')]
+
+    def print_version(self, url):
+        main, sep, rest = url.rpartition(',')
+        rmain, rsep, rrest = main.rpartition(',')
+        return rmain + ',druck-' + rrest + ',' + rest
diff --git a/src/calibre/web/feeds/recipes/spiegelde.py b/src/calibre/web/feeds/recipes/recipe_spiegelde.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/spiegelde.py
rename to src/calibre/web/feeds/recipes/recipe_spiegelde.py
diff --git a/src/calibre/web/feeds/recipes/st_petersburg_times.py b/src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/st_petersburg_times.py
rename to src/calibre/web/feeds/recipes/recipe_st_petersburg_times.py
diff --git a/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py b/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py
new file mode 100644
index 0000000000..5bfb1c3580
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_telegraph_uk.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+telegraph.co.uk
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class TelegraphUK(BasicNewsRecipe):
+    title                 = u'Telegraph.co.uk'
+    __author__            = 'Darko Miletic'
+    description           = 'News from United Kingdom'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+
+    keep_only_tags    = [ 
+                           dict(name='div', attrs={'class':'storyHead'})
+                          ,dict(name='div', attrs={'class':'story'    }) 
+                        ]
+    remove_tags    = [dict(name='div', attrs={'class':'slideshow'})]
+    
+    feeds          = [
+                         (u'UK News'        , u'http://www.telegraph.co.uk/news/uknews/rss'                                      )
+                        ,(u'World News'     , u'http://www.telegraph.co.uk/news/worldnews/rss'                                   )
+                        ,(u'Politics'       , u'http://www.telegraph.co.uk/news/newstopics/politics/rss'                         )
+                        ,(u'Technology News', u'http://www.telegraph.co.uk/scienceandtechnology/technology/technologynews/rss'   )
+                        ,(u'UK News'        , u'http://www.telegraph.co.uk/scienceandtechnology/technology/technologyreviews/rss')
+                        ,(u'Science News'   , u'http://www.telegraph.co.uk/scienceandtechnology/science/sciencenews/rss'         )
+                        ,(u'Sport'          , u'http://www.telegraph.co.uk/sport/rss'                                            )
+                        ,(u'Earth News'     , u'http://www.telegraph.co.uk/earth/earthnews/rss'                                  )
+                        ,(u'Comment'        , u'http://www.telegraph.co.uk/comment/rss'                                          )
+                        ,(u'How about that?', u'http://www.telegraph.co.uk/news/newstopics/howaboutthat/rss'                     )
+                     ]
diff --git a/src/calibre/web/feeds/recipes/recipe_the_nation.py b/src/calibre/web/feeds/recipes/recipe_the_nation.py
new file mode 100644
index 0000000000..ed21415efd
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_the_nation.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+thenation.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Thenation(BasicNewsRecipe):
+    title                 = u'The Nation'
+    __author__            = u'Darko Miletic'
+    description           = u'Unconventional Wisdom Since 1865'
+    oldest_article        = 120
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    simultaneous_downloads = 1
+    delay                  = 1
+    timefmt                = ' [%A, %d %B, %Y]'
+     
+
+    keep_only_tags = [ dict(name='div', attrs={'class':'main'}) ]
+    remove_tags = [
+                     dict(name='div', attrs={'class':'mod tools'})
+                    ,dict(name='div', attrs={'class':'inset'    })
+                    ,dict(name='div', attrs={'class':'share'    })
+                    ,dict(name='ol' , attrs={'id'   :'comments' })
+                    ,dict(name='p'  , attrs={'class':'info'     })
+                    ,dict(name='a'  , attrs={'class':'comments' })
+                    ,dict(name='ul' , attrs={'class':'important'})
+                    ,dict(name='object')
+                  ]
+
+    feeds       = [(u"Top Stories", u'http://feedproxy.google.com/TheNationEdPicks')]
diff --git a/src/calibre/web/feeds/recipes/the_scotsman.py b/src/calibre/web/feeds/recipes/recipe_the_scotsman.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/the_scotsman.py
rename to src/calibre/web/feeds/recipes/recipe_the_scotsman.py
diff --git a/src/calibre/web/feeds/recipes/recipe_themarketticker.py b/src/calibre/web/feeds/recipes/recipe_themarketticker.py
new file mode 100644
index 0000000000..946369c8a9
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_themarketticker.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+market-ticker.denninger.net
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Themarketticker(BasicNewsRecipe):
+    title                 = 'The Market Ticker'
+    __author__            = 'Darko Miletic'
+    description           = 'Commentary On The Capital Markets'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = True
+    html2lrf_options = [  '--comment'       , description
+                        , '--category'      , 'blog,news,finances'
+                        , '--base-font-size', '10'
+                       ]
+    feeds = [(u'Posts', u'http://market-ticker.denninger.net/feeds/index.rss2')]
diff --git a/src/calibre/web/feeds/recipes/recipe_time_magazine.py b/src/calibre/web/feeds/recipes/recipe_time_magazine.py
new file mode 100644
index 0000000000..026aa233db
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_time_magazine.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+time.com
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Time(BasicNewsRecipe):
+    title                 = u'Time'
+    __author__            = 'Kovid Goyal'
+    description           = 'Weekly magazine'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    
+    keep_only_tags = [dict(name='div', attrs={'class':'tout1'})]
+    remove_tags_after = [dict(id='connectStory')]
+    remove_tags    = [
+                      dict(name='ul', attrs={'class':['button', 'find']}),
+                      dict(name='div', attrs={'class':['nav', 'header', 'sectheader', 
+                                                       'searchWrap', 'subNav', 
+                                                       'artTools', 'connect',
+                                                       'similarrecs']}),
+                      dict(name='div', id=['articleSideBar', 'connectStory']),
+                      dict(name='dl', id=['links']),                                 
+                      ]
+
+    feeds          = [
+                       (u'Top Stories', u'http://feedproxy.google.com/time/topstories')
+                       ,(u'Nation', u'http://feedproxy.google.com/time/nation')
+                       ,(u'Business & Tech', u'http://feedproxy.google.com/time/business')
+                       ,(u'Science & Tech', u'http://feedproxy.google.com/time/scienceandhealth')
+                       ,(u'World', u'http://feedproxy.google.com/time/world')
+                       ,(u'Entertainment', u'http://feedproxy.google.com/time/entertainment')
+                       ,(u'Politics', u'http://feedproxy.google.com/time/politics')
+                       ,(u'Travel', u'http://feedproxy.google.com/time/travel')
+                     ]
+    
+    def get_article_url(self, article):
+        return article.get('guid',  article['link'])
+    
+    def get_cover_url(self):
+        soup = self.index_to_soup('http://www.time.com/time/')
+        img = soup.find('img', alt='Current Time.com Cover', width='107')
+        if img is not None:
+            return img.get('src', None)
+        
+    def print_version(self, url):
+        try:
+            soup = self.index_to_soup(url)
+            print_link = soup.find('a', {'id':'prt'})
+            return 'http://www.time.com' + print_link['href']
+        except:
+            self.log_exception('Failed to find print version for '+url)
+        return ''
diff --git a/src/calibre/web/feeds/recipes/times_online.py b/src/calibre/web/feeds/recipes/recipe_times_online.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/times_online.py
rename to src/calibre/web/feeds/recipes/recipe_times_online.py
diff --git a/src/calibre/web/feeds/recipes/recipe_tomshardware.py b/src/calibre/web/feeds/recipes/recipe_tomshardware.py
new file mode 100644
index 0000000000..657a6911f7
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_tomshardware.py
@@ -0,0 +1,58 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+tomshardware.com
+'''
+
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class Tomshardware(BasicNewsRecipe):
+    
+    title       = "Tom's Hardware US"
+    __author__  = 'Darko Miletic'
+    description = 'Hardware reviews and News'
+    no_stylesheets = True
+    needs_subscription = True
+    INDEX = 'http://www.tomshardware.com'
+    LOGIN = 'http://www.tomshardware.com/membres/?r=%2Fus%2F#loginForm'
+    cover_url = 'http://img.bestofmedia.com/img/tomshardware/design/tomshardware.jpg'
+    
+    html2lrf_options = [  '--comment'       , description
+                        , '--category'      , 'hardware,news'
+                        , '--base-font-size', '10'
+                       ]
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        if self.username is not None and self.password is not None:
+            br.open(self.LOGIN)
+            br.select_form(name='connexion')
+            br['login'] = self.username
+            br['mdp'  ] = self.password
+            br.submit()
+        return br
+
+    remove_tags = [
+                     dict(name='div' , attrs={'id':'header' })
+                    ,dict(name='object')
+                  ]
+    
+    feeds = [
+              (u'Latest Articles', u'http://www.tomshardware.com/feeds/atom/tom-s-hardware-us,18-2.xml')
+             ,(u'Latest News'    , u'http://www.tomshardware.com/feeds/atom/tom-s-hardware-us,18-1.xml')
+            ]
+                  
+    def print_version(self, url):
+        main, sep, rest = url.rpartition('.html')
+        rmain, rsep, article_id = main.rpartition(',')
+        tmain, tsep, trest = rmain.rpartition('/reviews/')
+        if tsep:
+           return 'http://www.tomshardware.com/review_print.php?p1=' + article_id
+        return 'http://www.tomshardware.com/news_print.php?p1=' + article_id        
+
+    def preprocess_html(self, soup):
+        del(soup.body['onload'])
+        return soup
diff --git a/src/calibre/web/feeds/recipes/upi.py b/src/calibre/web/feeds/recipes/recipe_upi.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/upi.py
rename to src/calibre/web/feeds/recipes/recipe_upi.py
diff --git a/src/calibre/web/feeds/recipes/usatoday.py b/src/calibre/web/feeds/recipes/recipe_usatoday.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/usatoday.py
rename to src/calibre/web/feeds/recipes/recipe_usatoday.py
diff --git a/src/calibre/web/feeds/recipes/recipe_utne.py b/src/calibre/web/feeds/recipes/recipe_utne.py
new file mode 100644
index 0000000000..eb22c21315
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_utne.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+utne.com
+'''
+
+from calibre.ebooks.BeautifulSoup import BeautifulSoup
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class Utne(BasicNewsRecipe):
+    title                 = u'Utne reader'
+    __author__            = 'Darko Miletic'
+    description           = 'News'    
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    
+    cover_url = 'http://www.utne.com/images/template/logo.gif'
+    
+    remove_tags = [
+                     dict(name='a' , attrs={'id':'ctl00_blankmaster_lnkBanner' })
+                    ,dict(name='object')
+                  ]
+
+    feeds          = [
+                        (u'Politics'     , u'http://www.utne.com/rss/Politics.xml')
+                       ,(u'Environment'  , u'http://www.utne.com/rss/Environment.xml')
+                       ,(u'Media'        , u'http://www.utne.com/rss/Media.xml')
+                       ,(u'Great writing', u'http://www.utne.com/rss/Great-Writing.xml')
+                       ,(u'Science & Technology', u'http://www.utne.com/rss/Science-Technology.xml')
+                       ,(u'Arts', u'http://www.utne.com/rss/Arts.xml')
+                     ]
+        
+    def print_version(self, url):
+        raw = self.browser.open(url).read()
+        soup = BeautifulSoup(raw.decode('utf8', 'replace'))
+        print_link = soup.find('a', {'id':'ctl00_defaultmaster_Blog_tools1_lnkPrint'})
+        if print_link is None:
+            return url
+        return print_link['href']
+
+    def preprocess_html(self, soup):
+        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+        soup.head.insert(0,mtag)
+        del(soup.body['onload'])
+        return soup
diff --git a/src/calibre/web/feeds/recipes/recipe_vreme.py b/src/calibre/web/feeds/recipes/recipe_vreme.py
new file mode 100644
index 0000000000..daee3ba3f7
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_vreme.py
@@ -0,0 +1,79 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
+'''
+vreme.com
+'''
+
+import string,re
+from calibre import strftime
+from calibre.web.feeds.recipes import BasicNewsRecipe
+
+class Vreme(BasicNewsRecipe):
+    
+    title       = 'Vreme'
+    __author__  = 'Darko Miletic'
+    description = 'Politicki Nedeljnik Srbije'
+    no_stylesheets = True
+    needs_subscription = True    
+    INDEX = 'http://www.vreme.com'
+    LOGIN = 'http://www.vreme.com/account/index.php'
+    html2lrf_options = [
+                          '--comment', description
+                        , '--base-font-size', '10'
+                        , '--category', 'news, politics, Serbia'
+                        , '--publisher', 'Vreme d.o.o.'
+                        ]
+
+    preprocess_regexps = [(re.compile(u'\u0110'), lambda match: u'\u00D0')]
+
+    def get_browser(self):
+        br = BasicNewsRecipe.get_browser()
+        if self.username is not None and self.password is not None:
+            br.open(self.LOGIN)
+            br.select_form(name='f')
+            br['username'] = self.username
+            br['password'] = self.password
+            br.submit()
+        return br
+    
+    def parse_index(self):
+        articles = []
+        soup = self.index_to_soup(self.INDEX)
+        
+        for item in soup.findAll('span', attrs={'class':'toc2'}):
+            description = ''
+            title_prefix = ''
+
+            descript_title_tag = item.findPreviousSibling('span', attrs={'class':'toc1'})
+            if descript_title_tag:
+               title_prefix = self.tag_to_string(descript_title_tag) + ' '
+
+            descript_tag = item.findNextSibling('span', attrs={'class':'toc3'})
+            if descript_tag:
+               description = self.tag_to_string(descript_tag)
+               
+            feed_link = item.find('a')
+            if feed_link and feed_link.has_key('href'):
+                url   = self.INDEX + feed_link['href']
+                title = title_prefix + self.tag_to_string(feed_link)
+                date  = strftime(self.timefmt)                
+                articles.append({
+                                  'title'      :title
+                                 ,'date'       :date
+                                 ,'url'        :url
+                                 ,'description':description
+                                })
+        return [(soup.head.title.string, articles)]
+        
+    def print_version(self, url):
+        return url + '&print=yes'
+
+    def get_cover_url(self):
+        cover_url = None
+        soup = self.index_to_soup(self.INDEX)
+        cover_item = soup.find('img',attrs={'alt':'Naslovna strana broja'})
+        if cover_item:
+           cover_url = self.INDEX + cover_item['src']
+        return cover_url
diff --git a/src/calibre/web/feeds/recipes/wash_post.py b/src/calibre/web/feeds/recipes/recipe_wash_post.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/wash_post.py
rename to src/calibre/web/feeds/recipes/recipe_wash_post.py
diff --git a/src/calibre/web/feeds/recipes/wired.py b/src/calibre/web/feeds/recipes/recipe_wired.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/wired.py
rename to src/calibre/web/feeds/recipes/recipe_wired.py
diff --git a/src/calibre/web/feeds/recipes/wsj.py b/src/calibre/web/feeds/recipes/recipe_wsj.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/wsj.py
rename to src/calibre/web/feeds/recipes/recipe_wsj.py
diff --git a/src/calibre/web/feeds/recipes/recipe_xkcd.py b/src/calibre/web/feeds/recipes/recipe_xkcd.py
new file mode 100644
index 0000000000..f76cf5614e
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_xkcd.py
@@ -0,0 +1,36 @@
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+'''
+Fetch xkcd.
+'''
+
+import time
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class XkcdCom(BasicNewsRecipe):
+    title = 'xkcd'
+    description = 'A webcomic of romance and math humor.'
+    __author__ = 'Martin Pitt'
+    use_embedded_content   = False
+    oldest_article = 60
+    keep_only_tags = [dict(id='middleContent')]
+    remove_tags = [dict(name='ul'), dict(name='h3'), dict(name='br')]
+    no_stylesheets = True
+    
+    def parse_index(self):
+        INDEX = 'http://xkcd.com/archive/'
+
+        soup = self.index_to_soup(INDEX) 
+        articles = []
+        for item in soup.findAll('a', title=True):
+            articles.append({
+                'date': item['title'],
+                'timestamp': time.mktime(time.strptime(item['title'], '%Y-%m-%d'))+1,
+                'url': 'http://xkcd.com' + item['href'],
+                'title': self.tag_to_string(item).encode('UTF-8'),
+                'description': '',
+                'content': '',
+            })
+
+        return [('xkcd', articles)]
diff --git a/src/calibre/web/feeds/recipes/recipe_zdnet.py b/src/calibre/web/feeds/recipes/recipe_zdnet.py
new file mode 100644
index 0000000000..6378f55ad8
--- /dev/null
+++ b/src/calibre/web/feeds/recipes/recipe_zdnet.py
@@ -0,0 +1,46 @@
+__license__   = 'GPL v3'
+__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
+
+'''
+Fetch zdnet.
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+import re
+
+
+class cdnet(BasicNewsRecipe):
+    
+    title = 'zdnet'
+    description = 'zdnet security'
+    __author__ = 'Oliver Niesner'
+    use_embedded_content   = False
+    timefmt = ' [%d %b %Y]'
+    max_articles_per_feed = 40
+    no_stylesheets = True
+    encoding = 'iso-8859-1'
+
+    #preprocess_regexps = \
+#	[(re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
+#		[
+#		(r'<84>', lambda match: ''),
+#		(r'<93>', lambda match: ''),
+#		]
+#	]
+    
+    remove_tags = [dict(id='eyebrows'),
+		   dict(id='header'),
+		   dict(id='search'),
+		   dict(id='nav'),
+		   dict(id=''),
+		   dict(name='div', attrs={'class':'banner'}),
+		   dict(name='p', attrs={'class':'tags'}),
+		   dict(name='div', attrs={'class':'special1'})]
+    remove_tags_after = [dict(name='div', attrs={'class':'bloggerDesc clear'})]
+    
+    feeds =  [ ('zdnet', 'http://feeds.feedburner.com/zdnet/security') ] 
+    
+
+
+
+
diff --git a/src/calibre/web/feeds/recipes/zeitde.py b/src/calibre/web/feeds/recipes/recipe_zeitde.py
similarity index 100%
rename from src/calibre/web/feeds/recipes/zeitde.py
rename to src/calibre/web/feeds/recipes/recipe_zeitde.py
diff --git a/src/calibre/web/feeds/recipes/vreme.py b/src/calibre/web/feeds/recipes/vreme.py
deleted file mode 100644
index 9c9bab4c60..0000000000
--- a/src/calibre/web/feeds/recipes/vreme.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env  python
-
-__license__   = 'GPL v3'
-__copyright__ = '2008, Darko Miletic <darko.miletic at gmail.com>'
-'''
-vreme.com
-'''
-
-import string
-import locale
-from calibre import strftime
-from calibre.web.feeds.recipes import BasicNewsRecipe
-
-class Vreme(BasicNewsRecipe):
-    
-    title       = 'Vreme'
-    __author__  = 'Darko Miletic'
-    description = 'Politicki Nedeljnik Srbije'
-    timefmt = ' [%A, %d %B, %Y]'
-    no_stylesheets = True
-    simultaneous_downloads = 1
-    delay = 1
-    needs_subscription = True
-    INDEX = 'http://www.vreme.com'
-    LOGIN = 'http://www.vreme.com/account/index.php'
-
-    def get_browser(self):
-        br = BasicNewsRecipe.get_browser()
-        if self.username is not None and self.password is not None:
-            br.open(self.LOGIN)
-            br.select_form(name='f')
-            br['username'] = self.username
-            br['password'] = self.password
-            br.submit()
-        return br
-    
-    def parse_index(self):
-        articles = []
-        soup = self.index_to_soup(self.INDEX)
-        
-        for item in soup.findAll('span', attrs={'class':'toc2'}):
-            feed_link = item.find('a')
-            if feed_link and feed_link.has_key('href'):
-                url = self.INDEX+feed_link['href']+'&print=yes'
-                title = self.tag_to_string(feed_link)
-                date = strftime('%A, %d %B, %Y')
-                description = ''
-                articles.append({
-                                 'title':title,
-                                 'date':date,
-                                 'url':url,
-                                 'description':description
-                                })
-        return [(soup.head.title.string, articles)]
diff --git a/src/calibre/web/feeds/templates.py b/src/calibre/web/feeds/templates.py
index d1bd593956..b2b96bd9a4 100644
--- a/src/calibre/web/feeds/templates.py
+++ b/src/calibre/web/feeds/templates.py
@@ -141,12 +141,12 @@ class FeedTemplate(Template):
         </div>
         <ul>
             <py:for each="i, article in enumerate(feed.articles)">
-            <li id="${'article_%d'%i}" py:if="getattr(article, 'downloaded', False)">
+            <li id="${'article_%d'%i}" py:if="getattr(article, 'downloaded', False)" style="padding-bottom:0.5em">
                 <a class="article" href="${article.url}">${article.title}</a>
                 <span class="article_date">${article.localtime.strftime(" [%a, %d %b %H:%M]")}</span>
-                <p class="article_decription" py:if="article.summary">
-                    ${Markup(cutoff(article.summary))}
-                </p>
+                <div class="article_decription" py:if="article.summary">
+                    ${Markup(cutoff(article.text_summary))}
+                </div>
             </li>
             </py:for>
         </ul>
diff --git a/src/calibre/web/fetch/simple.py b/src/calibre/web/fetch/simple.py
index 8880de4baa..2a8b03a545 100644
--- a/src/calibre/web/fetch/simple.py
+++ b/src/calibre/web/fetch/simple.py
@@ -68,9 +68,10 @@ def save_soup(soup, target):
     
 class response(str):
     
-    def __init__(self, *args):
-        str.__init__(self, *args)
-        self.newurl = None
+    def __new__(cls, *args):
+        obj = super(response, cls).__new__(cls, *args)
+        obj.newurl = None
+        return obj
         
 class DummyLock(object):
     
diff --git a/src/cherrypy/__init__.py b/src/cherrypy/__init__.py
index 317e465062..274f00694b 100644
--- a/src/cherrypy/__init__.py
+++ b/src/cherrypy/__init__.py
@@ -57,7 +57,7 @@ These API's are described in the CherryPy specification:
 http://www.cherrypy.org/wiki/CherryPySpec
 """
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 from urlparse import urljoin as _urljoin
 
@@ -337,6 +337,10 @@ class _ThreadLocalProxy(object):
     def __len__(self):
         child = getattr(serving, self.__attrname__)
         return len(child)
+    
+    def __nonzero__(self):
+        child = getattr(serving, self.__attrname__)
+        return bool(child)
 
 
 # Create request and response object (the same objects will be used
diff --git a/src/cherrypy/_cpconfig.py b/src/cherrypy/_cpconfig.py
index 815bb1936e..adc9911b17 100644
--- a/src/cherrypy/_cpconfig.py
+++ b/src/cherrypy/_cpconfig.py
@@ -303,13 +303,26 @@ def _engine_namespace_handler(k, v):
     elif k == 'autoreload_match':
         engine.autoreload.match = v
     elif k == 'reload_files':
-        engine.autoreload.files = v
+        engine.autoreload.files = set(v)
     elif k == 'deadlock_poll_freq':
         engine.timeout_monitor.frequency = v
     elif k == 'SIGHUP':
         engine.listeners['SIGHUP'] = set([v])
     elif k == 'SIGTERM':
         engine.listeners['SIGTERM'] = set([v])
+    elif "." in k:
+        plugin, attrname = k.split(".", 1)
+        plugin = getattr(engine, plugin)
+        if attrname == 'on':
+            if v and callable(getattr(plugin, 'subscribe', None)):
+                plugin.subscribe()
+                return
+            elif (not v) and callable(getattr(plugin, 'unsubscribe', None)):
+                plugin.unsubscribe()
+                return
+        setattr(plugin, attrname, v)
+    else:
+        setattr(engine, k, v)
 Config.namespaces["engine"] = _engine_namespace_handler
 
 
diff --git a/src/cherrypy/_cpdispatch.py b/src/cherrypy/_cpdispatch.py
index 4e7104bf72..c29fb05bbe 100644
--- a/src/cherrypy/_cpdispatch.py
+++ b/src/cherrypy/_cpdispatch.py
@@ -21,7 +21,127 @@ class PageHandler(object):
         self.kwargs = kwargs
     
     def __call__(self):
-        return self.callable(*self.args, **self.kwargs)
+        try:
+            return self.callable(*self.args, **self.kwargs)
+        except TypeError, x:
+            test_callable_spec(self.callable, self.args, self.kwargs)
+            raise
+
+def test_callable_spec(callable, callable_args, callable_kwargs):
+    """
+    Inspect callable and test to see if the given args are suitable for it.
+
+    When an error occurs during the handler's invoking stage there are 2
+    erroneous cases:
+    1.  Too many parameters passed to a function which doesn't define
+        one of *args or **kwargs.
+    2.  Too little parameters are passed to the function.
+
+    There are 3 sources of parameters to a cherrypy handler.
+    1.  query string parameters are passed as keyword parameters to the handler.
+    2.  body parameters are also passed as keyword parameters.
+    3.  when partial matching occurs, the final path atoms are passed as
+        positional args.
+    Both the query string and path atoms are part of the URI.  If they are
+    incorrect, then a 404 Not Found should be raised. Conversely the body
+    parameters are part of the request; if they are invalid a 400 Bad Request.
+    """
+    (args, varargs, varkw, defaults) = inspect.getargspec(callable)
+
+    if args and args[0] == 'self':
+        args = args[1:]
+
+    arg_usage = dict([(arg, 0,) for arg in args])
+    vararg_usage = 0
+    varkw_usage = 0
+    extra_kwargs = set()
+
+    for i, value in enumerate(callable_args):
+        try:
+            arg_usage[args[i]] += 1
+        except IndexError:
+            vararg_usage += 1
+
+    for key in callable_kwargs.keys():
+        try:
+            arg_usage[key] += 1
+        except KeyError:
+            varkw_usage += 1
+            extra_kwargs.add(key)
+
+    for i, val in enumerate(defaults or []):
+        # Defaults take effect only when the arg hasn't been used yet.
+        if arg_usage[args[i]] == 0:
+            arg_usage[args[i]] += 1
+
+    missing_args = []
+    multiple_args = []
+    for key, usage in arg_usage.iteritems():
+        if usage == 0:
+            missing_args.append(key)
+        elif usage > 1:
+            multiple_args.append(key)
+
+    if missing_args:
+        # In the case where the method allows body arguments
+        # there are 3 potential errors:
+        # 1. not enough query string parameters -> 404
+        # 2. not enough body parameters -> 400
+        # 3. not enough path parts (partial matches) -> 404
+        #
+        # We can't actually tell which case it is, 
+        # so I'm raising a 404 because that covers 2/3 of the
+        # possibilities
+        # 
+        # In the case where the method does not allow body
+        # arguments it's definitely a 404.
+        raise cherrypy.HTTPError(404,
+                message="Missing parameters: %s" % ",".join(missing_args))
+
+    # the extra positional arguments come from the path - 404 Not Found
+    if not varargs and vararg_usage > 0:
+        raise cherrypy.HTTPError(404)
+
+    body_params = cherrypy.request.body_params or {}
+    body_params = set(body_params.keys())
+    qs_params = set(callable_kwargs.keys()) - body_params
+
+    if multiple_args:
+
+        if qs_params.intersection(set(multiple_args)):
+            # If any of the multiple parameters came from the query string then
+            # it's a 404 Not Found
+            error = 404
+        else:
+            # Otherwise it's a 400 Bad Request
+            error = 400
+
+        raise cherrypy.HTTPError(error,
+                message="Multiple values for parameters: "\
+                        "%s" % ",".join(multiple_args))
+
+    if not varkw and varkw_usage > 0:
+
+        # If there were extra query string parameters, it's a 404 Not Found
+        extra_qs_params = set(qs_params).intersection(extra_kwargs)
+        if extra_qs_params:
+            raise cherrypy.HTTPError(404,
+                message="Unexpected query string "\
+                        "parameters: %s" % ", ".join(extra_qs_params))
+
+        # If there were any extra body parameters, it's a 400 Not Found
+        extra_body_params = set(body_params).intersection(extra_kwargs)
+        if extra_body_params:
+            raise cherrypy.HTTPError(400,
+                message="Unexpected body parameters: "\
+                        "%s" % ", ".join(extra_body_params))
+
+
+try:
+    import inspect
+except ImportError:
+    test_callable_spec = lambda callable, args, kwargs: None
+
 
 
 class LateParamPageHandler(PageHandler):
diff --git a/src/cherrypy/_cplogging.py b/src/cherrypy/_cplogging.py
index 12c93d3cd8..8556e108f9 100644
--- a/src/cherrypy/_cplogging.py
+++ b/src/cherrypy/_cplogging.py
@@ -126,7 +126,6 @@ class LogManager(object):
                 if stream is None:
                     stream=sys.stderr
                 h = logging.StreamHandler(stream)
-                h.setLevel(logging.DEBUG)
                 h.setFormatter(logfmt)
                 h._cpbuiltin = "screen"
                 log.addHandler(h)
@@ -149,7 +148,6 @@ class LogManager(object):
     
     def _add_builtin_file_handler(self, log, fname):
         h = logging.FileHandler(fname)
-        h.setLevel(logging.DEBUG)
         h.setFormatter(logfmt)
         h._cpbuiltin = "file"
         log.addHandler(h)
@@ -197,7 +195,6 @@ class LogManager(object):
         if enable:
             if not h:
                 h = WSGIErrorHandler()
-                h.setLevel(logging.DEBUG)
                 h.setFormatter(logfmt)
                 h._cpbuiltin = "wsgi"
                 log.addHandler(h)
diff --git a/src/cherrypy/_cprequest.py b/src/cherrypy/_cprequest.py
index 9ec310c972..3b245519cb 100644
--- a/src/cherrypy/_cprequest.py
+++ b/src/cherrypy/_cprequest.py
@@ -8,7 +8,7 @@ import types
 import cherrypy
 from cherrypy import _cpcgifs, _cpconfig
 from cherrypy._cperror import format_exc, bare_error
-from cherrypy.lib import http
+from cherrypy.lib import http, file_generator
 
 
 class Hook(object):
@@ -747,15 +747,6 @@ class Request(object):
             cherrypy.response.finalize()
 
 
-def file_generator(input, chunkSize=65536):
-    """Yield the given input (a file object) in chunks (default 64k). (Core)"""
-    chunk = input.read(chunkSize)
-    while chunk:
-        yield chunk
-        chunk = input.read(chunkSize)
-    input.close()
-
-
 class Body(object):
     """The body of the HTTP response (the response entity)."""
     
diff --git a/src/cherrypy/_cpserver.py b/src/cherrypy/_cpserver.py
index 53259cb086..0888295bec 100644
--- a/src/cherrypy/_cpserver.py
+++ b/src/cherrypy/_cpserver.py
@@ -49,6 +49,7 @@ class Server(ServerAdapter):
     protocol_version = 'HTTP/1.1'
     reverse_dns = False
     thread_pool = 10
+    thread_pool_max = -1
     max_request_header_size = 500 * 1024
     max_request_body_size = 100 * 1024 * 1024
     instance = None
diff --git a/src/cherrypy/_cptools.py b/src/cherrypy/_cptools.py
index 930ddab277..80ff583d22 100644
--- a/src/cherrypy/_cptools.py
+++ b/src/cherrypy/_cptools.py
@@ -466,7 +466,7 @@ _d.log_tracebacks = Tool('before_error_response', cptools.log_traceback)
 _d.log_headers = Tool('before_error_response', cptools.log_request_headers)
 _d.log_hooks = Tool('on_end_request', cptools.log_hooks, priority=100)
 _d.err_redirect = ErrorTool(cptools.redirect)
-_d.etags = Tool('before_finalize', cptools.validate_etags)
+_d.etags = Tool('before_finalize', cptools.validate_etags, priority=75)
 _d.decode = Tool('before_handler', encoding.decode)
 # the order of encoding, gzip, caching is important
 _d.encode = Tool('before_finalize', encoding.encode, priority=70)
diff --git a/src/cherrypy/_cptree.py b/src/cherrypy/_cptree.py
index 3dcd4a47e5..36d00865a2 100644
--- a/src/cherrypy/_cptree.py
+++ b/src/cherrypy/_cptree.py
@@ -153,6 +153,8 @@ class Tree(object):
         
         root: an instance of a "controller class" (a collection of page
             handler methods) which represents the root of the application.
+            This may also be an Application instance, or None if using
+            a dispatcher other than the default.
         script_name: a string containing the "mount point" of the application.
             This should start with a slash, and be the path portion of the
             URL at which to mount the given root. For example, if root.index()
@@ -168,11 +170,15 @@ class Tree(object):
         
         if isinstance(root, Application):
             app = root
+            if script_name != "" and script_name != app.script_name:
+                raise ValueError, "Cannot specify a different script name and pass an Application instance to cherrypy.mount"
+            script_name = app.script_name
         else:
             app = Application(root, script_name)
             
             # If mounted at "", add favicon.ico
-            if script_name == "" and root and not hasattr(root, "favicon_ico"):
+            if (script_name == "" and root is not None
+                    and not hasattr(root, "favicon_ico")):
                 favicon = os.path.join(os.getcwd(), os.path.dirname(__file__),
                                        "favicon.ico")
                 root.favicon_ico = tools.staticfile.handler(favicon)
diff --git a/src/cherrypy/_cpwsgi_server.py b/src/cherrypy/_cpwsgi_server.py
index 5953cf2ab0..ac8bfaa2ec 100644
--- a/src/cherrypy/_cpwsgi_server.py
+++ b/src/cherrypy/_cpwsgi_server.py
@@ -43,6 +43,7 @@ class CPWSGIServer(wsgiserver.CherryPyWSGIServer):
         s.__init__(self, bind_addr, cherrypy.tree,
                    server.thread_pool,
                    server.socket_host,
+                   max = server.thread_pool_max,
                    request_queue_size = server.socket_queue_size,
                    timeout = server.socket_timeout,
                    shutdown_timeout = server.shutdown_timeout,
diff --git a/src/cherrypy/cherryd b/src/cherrypy/cherryd
index 3d5cbdefce..ef1bd7a3d4 100644
--- a/src/cherrypy/cherryd
+++ b/src/cherrypy/cherryd
@@ -8,9 +8,10 @@ from cherrypy.process import plugins, servers
 
 
 def start(configfiles=None, daemonize=False, environment=None,
-          fastcgi=False, pidfile=None, imports=None):
+          fastcgi=False, scgi=False, pidfile=None, imports=None):
     """Subscribe all engine plugins and start the engine."""
-    for i in imports:
+    sys.path = [''] + sys.path
+    for i in imports or []:
         exec "import %s" % i
     
     for c in configfiles or []:
@@ -35,16 +36,27 @@ def start(configfiles=None, daemonize=False, environment=None,
     if hasattr(engine, "console_control_handler"):
         engine.console_control_handler.subscribe()
     
-    if fastcgi:
-        # turn off autoreload when using fastcgi
-        cherrypy.config.update({'autoreload.on': False})
-        
+    if fastcgi and scgi:
+        # fastcgi and scgi aren't allowed together.
+        cherrypy.log.error("fastcgi and scgi aren't allowed together.", 'ENGINE')
+        sys.exit(1)
+    elif fastcgi or scgi:
+        # Turn off autoreload when using fastcgi or scgi.
+        cherrypy.config.update({'engine.autoreload_on': False})
+        # Turn off the default HTTP server (which is subscribed by default).
         cherrypy.server.unsubscribe()
         
-        fastcgi_port = cherrypy.config.get('server.socket_port', 4000)
-        fastcgi_bindaddr = cherrypy.config.get('server.socket_host', '0.0.0.0')
-        bindAddress = (fastcgi_bindaddr, fastcgi_port)
-        f = servers.FlupFCGIServer(application=cherrypy.tree, bindAddress=bindAddress)
+        sock_file = cherrypy.config.get('server.socket_file', None)
+        if sock_file:
+            bindAddress = sock_file
+        else:
+            flup_port = cherrypy.config.get('server.socket_port', 4000)
+            flup_bindaddr = cherrypy.config.get('server.socket_host', '0.0.0.0')
+            bindAddress = (flup_bindaddr, flup_port)
+        if fastcgi:
+            f = servers.FlupFCGIServer(application=cherrypy.tree, bindAddress=bindAddress)
+        else:
+            f = servers.FlupSCGIServer(application=cherrypy.tree, bindAddress=bindAddress)
         s = servers.ServerAdapter(engine, httpserver=f, bind_addr=bindAddress)
         s.subscribe()
     
@@ -70,6 +82,8 @@ if __name__ == '__main__':
                  help="apply the given config environment")
     p.add_option('-f', action="store_true", dest='fastcgi',
                  help="start a fastcgi server instead of the default HTTP server")
+    p.add_option('-s', action="store_true", dest='scgi',
+                 help="start a scgi server instead of the default HTTP server")
     p.add_option('-i', '--import', action="append", dest='imports',
                  help="specify modules to import")
     p.add_option('-p', '--pidfile', dest='pidfile', default=None,
@@ -77,6 +91,6 @@ if __name__ == '__main__':
     options, args = p.parse_args()
     
     start(options.config, options.daemonize,
-          options.environment, options.fastcgi, options.pidfile,
+          options.environment, options.fastcgi, options.scgi, options.pidfile,
           options.imports)
 
diff --git a/src/cherrypy/lib/__init__.py b/src/cherrypy/lib/__init__.py
index 4e225cb12e..47be2eddd0 100644
--- a/src/cherrypy/lib/__init__.py
+++ b/src/cherrypy/lib/__init__.py
@@ -133,3 +133,26 @@ def unrepr(s):
     
     return _Builder().build(obj)
 
+
+def file_generator(input, chunkSize=65536):
+    """Yield the given input (a file object) in chunks (default 64k). (Core)"""
+    chunk = input.read(chunkSize)
+    while chunk:
+        yield chunk
+        chunk = input.read(chunkSize)
+    input.close()
+
+
+def file_generator_limited(fileobj, count, chunk_size=65536):
+    """Yield the given file object in chunks, stopping after `count`
+    bytes has been emitted.  Default chunk size is 64kB. (Core)
+    """
+    remaining = count
+    while remaining > 0:
+        chunk = fileobj.read(min(chunk_size, remaining))
+        chunklen = len(chunk)
+        if chunklen == 0:
+            return
+        remaining -= chunklen
+        yield chunk
+
diff --git a/src/cherrypy/lib/cptools.py b/src/cherrypy/lib/cptools.py
index 966c328945..eefd1ae73a 100644
--- a/src/cherrypy/lib/cptools.py
+++ b/src/cherrypy/lib/cptools.py
@@ -212,7 +212,7 @@ class SessionAuth(object):
     def on_check(self, username):
         pass
     
-    def login_screen(self, from_page='..', username='', error_msg=''):
+    def login_screen(self, from_page='..', username='', error_msg='', **kwargs):
         return """<html><body>
 Message: %(error_msg)s
 <form method="post" action="do_login">
@@ -224,7 +224,7 @@ Message: %(error_msg)s
 </body></html>""" % {'from_page': from_page, 'username': username,
                      'error_msg': error_msg}
     
-    def do_login(self, username, password, from_page='..'):
+    def do_login(self, username, password, from_page='..', **kwargs):
         """Login. May raise redirect, or return True if request handled."""
         error_msg = self.check_username_and_password(username, password)
         if error_msg:
@@ -239,7 +239,7 @@ Message: %(error_msg)s
             self.on_login(username)
             raise cherrypy.HTTPRedirect(from_page or "/")
     
-    def do_logout(self, from_page='..'):
+    def do_logout(self, from_page='..', **kwargs):
         """Logout. May raise redirect, or return True if request handled."""
         sess = cherrypy.session
         username = sess.get(self.session_key)
diff --git a/src/cherrypy/lib/http.py b/src/cherrypy/lib/http.py
index 5449d55b7f..82dfa5bf80 100644
--- a/src/cherrypy/lib/http.py
+++ b/src/cherrypy/lib/http.py
@@ -251,7 +251,12 @@ def valid_status(status):
 image_map_pattern = re.compile(r"[0-9]+,[0-9]+")
 
 def parse_query_string(query_string, keep_blank_values=True):
-    """Build a params dictionary from a query_string."""
+    """Build a params dictionary from a query_string.
+    
+    Duplicate key/value pairs in the provided query_string will be
+    returned as {'key': [val1, val2, ...]}. Single key/values will
+    be returned as strings: {'key': 'value'}.
+    """
     if image_map_pattern.match(query_string):
         # Server-side image map. Map the coords to 'x' and 'y'
         # (like CGI::Request does).
diff --git a/src/cherrypy/lib/httpauth.py b/src/cherrypy/lib/httpauth.py
index 524db9a6b5..bc658244cd 100644
--- a/src/cherrypy/lib/httpauth.py
+++ b/src/cherrypy/lib/httpauth.py
@@ -275,7 +275,7 @@ def _computeDigestResponse(auth_map, password, method = "GET", A1 = None,**kwarg
     else:
         H_A1 = H(_A1(params, password))
 
-    if qop == "auth" or aop == "auth-int":
+    if qop in ("auth", "auth-int"):
         # If the "qop" value is "auth" or "auth-int":
         # request-digest  = <"> < KD ( H(A1),     unq(nonce-value)
         #                              ":" nc-value
@@ -290,7 +290,6 @@ def _computeDigestResponse(auth_map, password, method = "GET", A1 = None,**kwarg
             params["qop"],
             H_A2,
         )
-
     elif qop is None:
         # If the "qop" directive is not present (this construction is
         # for compatibility with RFC 2069):
diff --git a/src/cherrypy/lib/profiler.py b/src/cherrypy/lib/profiler.py
index 9d5481dd7e..704fec47a5 100644
--- a/src/cherrypy/lib/profiler.py
+++ b/src/cherrypy/lib/profiler.py
@@ -160,7 +160,15 @@ class ProfileAggregator(Profiler):
 
 class make_app:
     def __init__(self, nextapp, path=None, aggregate=False):
-        """Make a WSGI middleware app which wraps 'nextapp' with profiling."""
+        """Make a WSGI middleware app which wraps 'nextapp' with profiling.
+        
+        nextapp: the WSGI application to wrap, usually an instance of
+            cherrypy.Application.
+        path: where to dump the profiling output.
+        aggregate: if True, profile data for all HTTP requests will go in
+            a single file. If False (the default), each HTTP request will
+            dump its profile data into a separate file.
+        """
         self.nextapp = nextapp
         self.aggregate = aggregate
         if aggregate:
diff --git a/src/cherrypy/lib/safemime.py b/src/cherrypy/lib/safemime.py
index cf41dbf27b..0d13ae9a91 100644
--- a/src/cherrypy/lib/safemime.py
+++ b/src/cherrypy/lib/safemime.py
@@ -109,7 +109,7 @@ class MultipartWrapper(object):
 def safe_multipart(flash_only=False):
     """Wrap request.rfile in a reader that won't crash on no trailing CRLF."""
     h = cherrypy.request.headers
-    if not h.get('Content-Type').startswith('multipart/'):
+    if not h.get('Content-Type','').startswith('multipart/'):
         return
     if flash_only and not 'Shockwave Flash' in h.get('User-Agent', ''):
         return
diff --git a/src/cherrypy/lib/sessions-r2062.py b/src/cherrypy/lib/sessions-r2062.py
new file mode 100644
index 0000000000..881002e6fd
--- /dev/null
+++ b/src/cherrypy/lib/sessions-r2062.py
@@ -0,0 +1,698 @@
+"""Session implementation for CherryPy.
+
+We use cherrypy.request to store some convenient variables as
+well as data about the session for the current request. Instead of
+polluting cherrypy.request we use a Session object bound to
+cherrypy.session to store these variables.
+"""
+
+import datetime
+import os
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+import random
+import sha
+import time
+import threading
+import types
+from warnings import warn
+
+import cherrypy
+from cherrypy.lib import http
+
+
+missing = object()
+
+class Session(object):
+    """A CherryPy dict-like Session object (one per request)."""
+    
+    __metaclass__ = cherrypy._AttributeDocstrings
+    
+    _id = None
+    id_observers = None
+    id_observers__doc = "A list of callbacks to which to pass new id's."
+    
+    id__doc = "The current session ID."
+    def _get_id(self):
+        return self._id
+    def _set_id(self, value):
+        self._id = value
+        for o in self.id_observers:
+            o(value)
+    id = property(_get_id, _set_id, doc=id__doc)
+    
+    timeout = 60
+    timeout__doc = "Number of minutes after which to delete session data."
+    
+    locked = False
+    locked__doc = """
+    If True, this session instance has exclusive read/write access
+    to session data."""
+    
+    loaded = False
+    loaded__doc = """
+    If True, data has been retrieved from storage. This should happen
+    automatically on the first attempt to access session data."""
+    
+    clean_thread = None
+    clean_thread__doc = "Class-level Monitor which calls self.clean_up."
+    
+    clean_freq = 5
+    clean_freq__doc = "The poll rate for expired session cleanup in minutes."
+    
+    def __init__(self, id=None, **kwargs):
+        self.id_observers = []
+        self._data = {}
+        
+        for k, v in kwargs.iteritems():
+            setattr(self, k, v)
+        
+        if id is None:
+            self.regenerate()
+        else:
+            self.id = id
+            if not self._exists():
+                # Expired or malicious session. Make a new one.
+                # See http://www.cherrypy.org/ticket/709.
+                self.id = None
+                self.regenerate()
+    
+    def regenerate(self):
+        """Replace the current session (with a new id)."""
+        if self.id is not None:
+            self.delete()
+        
+        old_session_was_locked = self.locked
+        if old_session_was_locked:
+            self.release_lock()
+        
+        self.id = None
+        while self.id is None:
+            self.id = self.generate_id()
+            # Assert that the generated id is not already stored.
+            if self._exists():
+                self.id = None
+        
+        if old_session_was_locked:
+            self.acquire_lock()
+    
+    def clean_up(self):
+        """Clean up expired sessions."""
+        pass
+    
+    try:
+        os.urandom(20)
+    except (AttributeError, NotImplementedError):
+        # os.urandom not available until Python 2.4. Fall back to random.random.
+        def generate_id(self):
+            """Return a new session id."""
+            return sha.new('%s' % random.random()).hexdigest()
+    else:
+        def generate_id(self):
+            """Return a new session id."""
+            return os.urandom(20).encode('hex')
+    
+    def save(self):
+        """Save session data."""
+        try:
+            # If session data has never been loaded then it's never been
+            #   accessed: no need to delete it
+            if self.loaded:
+                t = datetime.timedelta(seconds = self.timeout * 60)
+                expiration_time = datetime.datetime.now() + t
+                self._save(expiration_time)
+            
+        finally:
+            if self.locked:
+                # Always release the lock if the user didn't release it
+                self.release_lock()
+    
+    def load(self):
+        """Copy stored session data into this session instance."""
+        data = self._load()
+        # data is either None or a tuple (session_data, expiration_time)
+        if data is None or data[1] < datetime.datetime.now():
+            # Expired session: flush session data
+            self._data = {}
+        else:
+            self._data = data[0]
+        self.loaded = True
+        
+        # Stick the clean_thread in the class, not the instance.
+        # The instances are created and destroyed per-request.
+        cls = self.__class__
+        if self.clean_freq and not cls.clean_thread:
+            # clean_up is in instancemethod and not a classmethod,
+            # so that tool config can be accessed inside the method.
+            t = cherrypy.process.plugins.Monitor(
+                cherrypy.engine, self.clean_up, self.clean_freq * 60)
+            t.subscribe()
+            cls.clean_thread = t
+            t.start()
+    
+    def delete(self):
+        """Delete stored session data."""
+        self._delete()
+    
+    def __getitem__(self, key):
+        if not self.loaded: self.load()
+        return self._data[key]
+    
+    def __setitem__(self, key, value):
+        if not self.loaded: self.load()
+        self._data[key] = value
+    
+    def __delitem__(self, key):
+        if not self.loaded: self.load()
+        del self._data[key]
+    
+    def pop(self, key, default=missing):
+        """Remove the specified key and return the corresponding value.
+        If key is not found, default is returned if given,
+        otherwise KeyError is raised.
+        """
+        if not self.loaded: self.load()
+        if default is missing:
+            return self._data.pop(key)
+        else:
+            return self._data.pop(key, default)
+    
+    def __contains__(self, key):
+        if not self.loaded: self.load()
+        return key in self._data
+    
+    def has_key(self, key):
+        """D.has_key(k) -> True if D has a key k, else False."""
+        if not self.loaded: self.load()
+        return self._data.has_key(key)
+    
+    def get(self, key, default=None):
+        """D.get(k[,d]) -> D[k] if k in D, else d.  d defaults to None."""
+        if not self.loaded: self.load()
+        return self._data.get(key, default)
+    
+    def update(self, d):
+        """D.update(E) -> None.  Update D from E: for k in E: D[k] = E[k]."""
+        if not self.loaded: self.load()
+        self._data.update(d)
+    
+    def setdefault(self, key, default=None):
+        """D.setdefault(k[,d]) -> D.get(k,d), also set D[k]=d if k not in D."""
+        if not self.loaded: self.load()
+        return self._data.setdefault(key, default)
+    
+    def clear(self):
+        """D.clear() -> None.  Remove all items from D."""
+        if not self.loaded: self.load()
+        self._data.clear()
+    
+    def keys(self):
+        """D.keys() -> list of D's keys."""
+        if not self.loaded: self.load()
+        return self._data.keys()
+    
+    def items(self):
+        """D.items() -> list of D's (key, value) pairs, as 2-tuples."""
+        if not self.loaded: self.load()
+        return self._data.items()
+    
+    def values(self):
+        """D.values() -> list of D's values."""
+        if not self.loaded: self.load()
+        return self._data.values()
+
+
+class RamSession(Session):
+    
+    # Class-level objects. Don't rebind these!
+    cache = {}
+    locks = {}
+    
+    def clean_up(self):
+        """Clean up expired sessions."""
+        now = datetime.datetime.now()
+        for id, (data, expiration_time) in self.cache.items():
+            if expiration_time < now:
+                try:
+                    del self.cache[id]
+                except KeyError:
+                    pass
+                try:
+                    del self.locks[id]
+                except KeyError:
+                    pass
+    
+    def _exists(self):
+        return self.id in self.cache
+    
+    def _load(self):
+        return self.cache.get(self.id)
+    
+    def _save(self, expiration_time):
+        self.cache[self.id] = (self._data, expiration_time)
+    
+    def _delete(self):
+        del self.cache[self.id]
+    
+    def acquire_lock(self):
+        """Acquire an exclusive lock on the currently-loaded session data."""
+        self.locked = True
+        self.locks.setdefault(self.id, threading.RLock()).acquire()
+    
+    def release_lock(self):
+        """Release the lock on the currently-loaded session data."""
+        self.locks[self.id].release()
+        self.locked = False
+    
+    def __len__(self):
+        """Return the number of active sessions."""
+        return len(self.cache)
+
+
+class FileSession(Session):
+    """Implementation of the File backend for sessions
+    
+    storage_path: the folder where session data will be saved. Each session
+        will be saved as pickle.dump(data, expiration_time) in its own file;
+        the filename will be self.SESSION_PREFIX + self.id.
+    """
+    
+    SESSION_PREFIX = 'session-'
+    LOCK_SUFFIX = '.lock'
+    
+    def __init__(self, id=None, **kwargs):
+        # The 'storage_path' arg is required for file-based sessions.
+        kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
+        Session.__init__(self, id=id, **kwargs)
+    
+    def setup(cls, **kwargs):
+        """Set up the storage system for file-based sessions.
+        
+        This should only be called once per process; this will be done
+        automatically when using sessions.init (as the built-in Tool does).
+        """
+        # The 'storage_path' arg is required for file-based sessions.
+        kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
+        
+        for k, v in kwargs.iteritems():
+            setattr(cls, k, v)
+        
+        # Warn if any lock files exist at startup.
+        lockfiles = [fname for fname in os.listdir(cls.storage_path)
+                     if (fname.startswith(cls.SESSION_PREFIX)
+                         and fname.endswith(cls.LOCK_SUFFIX))]
+        if lockfiles:
+            plural = ('', 's')[len(lockfiles) > 1]
+            warn("%s session lockfile%s found at startup. If you are "
+                 "only running one process, then you may need to "
+                 "manually delete the lockfiles found at %r."
+                 % (len(lockfiles), plural, cls.storage_path))
+    setup = classmethod(setup)
+    
+    def _get_file_path(self):
+        f = os.path.join(self.storage_path, self.SESSION_PREFIX + self.id)
+        if not os.path.abspath(f).startswith(self.storage_path):
+            raise cherrypy.HTTPError(400, "Invalid session id in cookie.")
+        return f
+    
+    def _exists(self):
+        path = self._get_file_path()
+        return os.path.exists(path)
+    
+    def _load(self, path=None):
+        if path is None:
+            path = self._get_file_path()
+        try:
+            f = open(path, "rb")
+            try:
+                return pickle.load(f)
+            finally:
+                f.close()
+        except (IOError, EOFError):
+            return None
+    
+    def _save(self, expiration_time):
+        f = open(self._get_file_path(), "wb")
+        try:
+            pickle.dump((self._data, expiration_time), f)
+        finally:
+            f.close()
+    
+    def _delete(self):
+        try:
+            os.unlink(self._get_file_path())
+        except OSError:
+            pass
+    
+    def acquire_lock(self, path=None):
+        """Acquire an exclusive lock on the currently-loaded session data."""
+        if path is None:
+            path = self._get_file_path()
+        path += self.LOCK_SUFFIX
+        while True:
+            try:
+                lockfd = os.open(path, os.O_CREAT|os.O_WRONLY|os.O_EXCL)
+            except OSError:
+                time.sleep(0.1)
+            else:
+                os.close(lockfd) 
+                break
+        self.locked = True
+    
+    def release_lock(self, path=None):
+        """Release the lock on the currently-loaded session data."""
+        if path is None:
+            path = self._get_file_path()
+        os.unlink(path + self.LOCK_SUFFIX)
+        self.locked = False
+    
+    def clean_up(self):
+        """Clean up expired sessions."""
+        now = datetime.datetime.now()
+        # Iterate over all session files in self.storage_path
+        for fname in os.listdir(self.storage_path):
+            if (fname.startswith(self.SESSION_PREFIX)
+                and not fname.endswith(self.LOCK_SUFFIX)):
+                # We have a session file: lock and load it and check
+                #   if it's expired. If it fails, nevermind.
+                path = os.path.join(self.storage_path, fname)
+                self.acquire_lock(path)
+                try:
+                    contents = self._load(path)
+                    # _load returns None on IOError
+                    if contents is not None:
+                        data, expiration_time = contents
+                        if expiration_time < now:
+                            # Session expired: deleting it
+                            os.unlink(path)
+                finally:
+                    self.release_lock(path)
+    
+    def __len__(self):
+        """Return the number of active sessions."""
+        return len([fname for fname in os.listdir(self.storage_path)
+                    if (fname.startswith(self.SESSION_PREFIX)
+                        and not fname.endswith(self.LOCK_SUFFIX))])
+
+
+class PostgresqlSession(Session):
+    """ Implementation of the PostgreSQL backend for sessions. It assumes
+        a table like this:
+
+            create table session (
+                id varchar(40),
+                data text,
+                expiration_time timestamp
+            )
+    
+    You must provide your own get_db function.
+    """
+    
+    def __init__(self, id=None, **kwargs):
+        Session.__init__(self, id, **kwargs)
+        self.cursor = self.db.cursor()
+    
+    def setup(cls, **kwargs):
+        """Set up the storage system for Postgres-based sessions.
+        
+        This should only be called once per process; this will be done
+        automatically when using sessions.init (as the built-in Tool does).
+        """
+        for k, v in kwargs.iteritems():
+            setattr(cls, k, v)
+        
+        self.db = self.get_db()
+    setup = classmethod(setup)
+    
+    def __del__(self):
+        if self.cursor:
+            self.cursor.close()
+        self.db.commit()
+    
+    def _exists(self):
+        # Select session data from table
+        self.cursor.execute('select data, expiration_time from session '
+                            'where id=%s', (self.id,))
+        rows = self.cursor.fetchall()
+        return bool(rows)
+    
+    def _load(self):
+        # Select session data from table
+        self.cursor.execute('select data, expiration_time from session '
+                            'where id=%s', (self.id,))
+        rows = self.cursor.fetchall()
+        if not rows:
+            return None
+        
+        pickled_data, expiration_time = rows[0]
+        data = pickle.loads(pickled_data)
+        return data, expiration_time
+    
+    def _save(self, expiration_time):
+        pickled_data = pickle.dumps(self._data)
+        self.cursor.execute('update session set data = %s, '
+                            'expiration_time = %s where id = %s',
+                            (pickled_data, expiration_time, self.id))
+    
+    def _delete(self):
+        self.cursor.execute('delete from session where id=%s', (self.id,))
+   
+    def acquire_lock(self):
+        """Acquire an exclusive lock on the currently-loaded session data."""
+        # We use the "for update" clause to lock the row
+        self.locked = True
+        self.cursor.execute('select id from session where id=%s for update',
+                            (self.id,))
+    
+    def release_lock(self):
+        """Release the lock on the currently-loaded session data."""
+        # We just close the cursor and that will remove the lock
+        #   introduced by the "for update" clause
+        self.cursor.close()
+        self.locked = False
+    
+    def clean_up(self):
+        """Clean up expired sessions."""
+        self.cursor.execute('delete from session where expiration_time < %s',
+                            (datetime.datetime.now(),))
+
+
+class MemcachedSession(Session):
+    
+    # The most popular memcached client for Python isn't thread-safe.
+    # Wrap all .get and .set operations in a single lock.
+    mc_lock = threading.RLock()
+    
+    # This is a seperate set of locks per session id.
+    locks = {}
+    
+    servers = ['127.0.0.1:11211']
+    
+    def setup(cls, **kwargs):
+        """Set up the storage system for memcached-based sessions.
+        
+        This should only be called once per process; this will be done
+        automatically when using sessions.init (as the built-in Tool does).
+        """
+        for k, v in kwargs.iteritems():
+            setattr(cls, k, v)
+        
+        import memcache
+        cls.cache = memcache.Client(cls.servers)
+    setup = classmethod(setup)
+    
+    def _exists(self):
+        self.mc_lock.acquire()
+        try:
+            return bool(self.cache.get(self.id))
+        finally:
+            self.mc_lock.release()
+    
+    def _load(self):
+        self.mc_lock.acquire()
+        try:
+            return self.cache.get(self.id)
+        finally:
+            self.mc_lock.release()
+    
+    def _save(self, expiration_time):
+        # Send the expiration time as "Unix time" (seconds since 1/1/1970)
+        td = int(time.mktime(expiration_time.timetuple()))
+        self.mc_lock.acquire()
+        try:
+            if not self.cache.set(self.id, (self._data, expiration_time), td):
+                raise AssertionError("Session data for id %r not set." % self.id)
+        finally:
+            self.mc_lock.release()
+    
+    def _delete(self):
+        self.cache.delete(self.id)
+    
+    def acquire_lock(self):
+        """Acquire an exclusive lock on the currently-loaded session data."""
+        self.locked = True
+        self.locks.setdefault(self.id, threading.RLock()).acquire()
+    
+    def release_lock(self):
+        """Release the lock on the currently-loaded session data."""
+        self.locks[self.id].release()
+        self.locked = False
+    
+    def __len__(self):
+        """Return the number of active sessions."""
+        raise NotImplementedError
+
+
+# Hook functions (for CherryPy tools)
+
+def save():
+    """Save any changed session data."""
+    
+    if not hasattr(cherrypy.serving, "session"):
+        return
+    
+    # Guard against running twice
+    if hasattr(cherrypy.request, "_sessionsaved"):
+        return
+    cherrypy.request._sessionsaved = True
+    
+    if cherrypy.response.stream:
+        # If the body is being streamed, we have to save the data
+        #   *after* the response has been written out
+        cherrypy.request.hooks.attach('on_end_request', cherrypy.session.save)
+    else:
+        # If the body is not being streamed, we save the data now
+        # (so we can release the lock).
+        if isinstance(cherrypy.response.body, types.GeneratorType):
+            cherrypy.response.collapse_body()
+        cherrypy.session.save()
+save.failsafe = True
+
+def close():
+    """Close the session object for this request."""
+    sess = getattr(cherrypy.serving, "session", None)
+    if getattr(sess, "locked", False):
+        # If the session is still locked we release the lock
+        sess.release_lock()
+close.failsafe = True
+close.priority = 90
+
+
+def init(storage_type='ram', path=None, path_header=None, name='session_id',
+         timeout=60, domain=None, secure=False, clean_freq=5,
+         persistent=True, **kwargs):
+    """Initialize session object (using cookies).
+    
+    storage_type: one of 'ram', 'file', 'postgresql'. This will be used
+        to look up the corresponding class in cherrypy.lib.sessions
+        globals. For example, 'file' will use the FileSession class.
+    path: the 'path' value to stick in the response cookie metadata.
+    path_header: if 'path' is None (the default), then the response
+        cookie 'path' will be pulled from request.headers[path_header].
+    name: the name of the cookie.
+    timeout: the expiration timeout (in minutes) for the stored session data.
+        If 'persistent' is True (the default), this is also the timeout
+        for the cookie.
+    domain: the cookie domain.
+    secure: if False (the default) the cookie 'secure' value will not
+        be set. If True, the cookie 'secure' value will be set (to 1).
+    clean_freq (minutes): the poll rate for expired session cleanup.
+    persistent: if True (the default), the 'timeout' argument will be used
+        to expire the cookie. If False, the cookie will not have an expiry,
+        and the cookie will be a "session cookie" which expires when the
+        browser is closed.
+    
+    Any additional kwargs will be bound to the new Session instance,
+    and may be specific to the storage type. See the subclass of Session
+    you're using for more information.
+    """
+    
+    request = cherrypy.request
+    
+    # Guard against running twice
+    if hasattr(request, "_session_init_flag"):
+        return
+    request._session_init_flag = True
+    
+    # Check if request came with a session ID
+    id = None
+    if name in request.cookie:
+        id = request.cookie[name].value
+    
+    # Find the storage class and call setup (first time only).
+    storage_class = storage_type.title() + 'Session'
+    storage_class = globals()[storage_class]
+    if not hasattr(cherrypy, "session"):
+        if hasattr(storage_class, "setup"):
+            storage_class.setup(**kwargs)
+    
+    # Create and attach a new Session instance to cherrypy.serving.
+    # It will possess a reference to (and lock, and lazily load)
+    # the requested session data.
+    kwargs['timeout'] = timeout
+    kwargs['clean_freq'] = clean_freq
+    cherrypy.serving.session = sess = storage_class(id, **kwargs)
+    def update_cookie(id):
+        """Update the cookie every time the session id changes."""
+        cherrypy.response.cookie[name] = id
+    sess.id_observers.append(update_cookie)
+    
+    # Create cherrypy.session which will proxy to cherrypy.serving.session
+    if not hasattr(cherrypy, "session"):
+        cherrypy.session = cherrypy._ThreadLocalProxy('session')
+    
+    if persistent:
+        cookie_timeout = timeout
+    else:
+        # See http://support.microsoft.com/kb/223799/EN-US/
+        # and http://support.mozilla.com/en-US/kb/Cookies
+        cookie_timeout = None
+    set_response_cookie(path=path, path_header=path_header, name=name,
+                        timeout=cookie_timeout, domain=domain, secure=secure)
+
+
+def set_response_cookie(path=None, path_header=None, name='session_id',
+                        timeout=60, domain=None, secure=False):
+    """Set a response cookie for the client.
+    
+    path: the 'path' value to stick in the response cookie metadata.
+    path_header: if 'path' is None (the default), then the response
+        cookie 'path' will be pulled from request.headers[path_header].
+    name: the name of the cookie.
+    timeout: the expiration timeout for the cookie. If 0 or other boolean
+        False, no 'expires' param will be set, and the cookie will be a
+        "session cookie" which expires when the browser is closed.
+    domain: the cookie domain.
+    secure: if False (the default) the cookie 'secure' value will not
+        be set. If True, the cookie 'secure' value will be set (to 1).
+    """
+    # Set response cookie
+    cookie = cherrypy.response.cookie
+    cookie[name] = cherrypy.serving.session.id
+    cookie[name]['path'] = (path or cherrypy.request.headers.get(path_header)
+                            or '/')
+    
+    # We'd like to use the "max-age" param as indicated in
+    # http://www.faqs.org/rfcs/rfc2109.html but IE doesn't
+    # save it to disk and the session is lost if people close
+    # the browser. So we have to use the old "expires" ... sigh ...
+##    cookie[name]['max-age'] = timeout * 60
+    if timeout:
+        cookie[name]['expires'] = http.HTTPDate(time.time() + (timeout * 60))
+    if domain is not None:
+        cookie[name]['domain'] = domain
+    if secure:
+        cookie[name]['secure'] = 1
+
+
+def expire():
+    """Expire the current session cookie."""
+    name = cherrypy.request.config.get('tools.sessions.name', 'session_id')
+    one_year = 60 * 60 * 24 * 365
+    exp = time.gmtime(time.time() - one_year)
+    t = time.strftime("%a, %d-%b-%Y %H:%M:%S GMT", exp)
+    cherrypy.response.cookie[name]['expires'] = t
+
+
diff --git a/src/cherrypy/lib/sessions.py b/src/cherrypy/lib/sessions.py
index fe842192f3..fb3676c557 100644
--- a/src/cherrypy/lib/sessions.py
+++ b/src/cherrypy/lib/sessions.py
@@ -143,7 +143,7 @@ class Session(object):
         # Stick the clean_thread in the class, not the instance.
         # The instances are created and destroyed per-request.
         cls = self.__class__
-        if not cls.clean_thread:
+        if self.clean_freq and not cls.clean_thread:
             # clean_up is in instancemethod and not a classmethod,
             # so that tool config can be accessed inside the method.
             t = cherrypy.process.plugins.Monitor(
@@ -282,14 +282,19 @@ class FileSession(Session):
     SESSION_PREFIX = 'session-'
     LOCK_SUFFIX = '.lock'
     
+    def __init__(self, id=None, **kwargs):
+        # The 'storage_path' arg is required for file-based sessions.
+        kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
+        Session.__init__(self, id=id, **kwargs)
+    
     def setup(cls, **kwargs):
         """Set up the storage system for file-based sessions.
         
         This should only be called once per process; this will be done
         automatically when using sessions.init (as the built-in Tool does).
         """
-        if 'storage_path' in kwargs:
-            kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
+        # The 'storage_path' arg is required for file-based sessions.
+        kwargs['storage_path'] = os.path.abspath(kwargs['storage_path'])
         
         for k, v in kwargs.iteritems():
             setattr(cls, k, v)
diff --git a/src/cherrypy/lib/static.py b/src/cherrypy/lib/static.py
index e9df62f7bd..f4e3efe054 100644
--- a/src/cherrypy/lib/static.py
+++ b/src/cherrypy/lib/static.py
@@ -10,7 +10,7 @@ import time
 import urllib
 
 import cherrypy
-from cherrypy.lib import cptools, http
+from cherrypy.lib import cptools, http, file_generator_limited
 
 
 def serve_file(path, content_type=None, disposition=None, name=None):
@@ -83,13 +83,15 @@ def serve_file(path, content_type=None, disposition=None, name=None):
             if len(r) == 1:
                 # Return a single-part response.
                 start, stop = r[0]
+                if stop > c_len:
+                    stop = c_len
                 r_len = stop - start
                 response.status = "206 Partial Content"
                 response.headers['Content-Range'] = ("bytes %s-%s/%s" %
                                                        (start, stop - 1, c_len))
                 response.headers['Content-Length'] = r_len
                 bodyfile.seek(start)
-                response.body = bodyfile.read(r_len)
+                response.body = file_generator_limited(bodyfile, r_len)
             else:
                 # Return a multipart/byteranges response.
                 response.status = "206 Partial Content"
@@ -111,7 +113,8 @@ def serve_file(path, content_type=None, disposition=None, name=None):
                         yield ("\r\nContent-range: bytes %s-%s/%s\r\n\r\n"
                                % (start, stop - 1, c_len))
                         bodyfile.seek(start)
-                        yield bodyfile.read(stop - start)
+                        for chunk in file_generator_limited(bodyfile, stop-start):
+                            yield chunk
                         yield "\r\n"
                     # Final boundary
                     yield "--" + boundary + "--"
diff --git a/src/cherrypy/lib/xmlrpc.py b/src/cherrypy/lib/xmlrpc.py
index c95970f205..59ee0278fe 100644
--- a/src/cherrypy/lib/xmlrpc.py
+++ b/src/cherrypy/lib/xmlrpc.py
@@ -42,7 +42,7 @@ def respond(body, encoding='utf-8', allow_none=0):
                                   encoding=encoding,
                                   allow_none=allow_none))
 
-def on_error():
+def on_error(*args, **kwargs):
     body = str(sys.exc_info()[1])
     import xmlrpclib
     _set_response(xmlrpclib.dumps(xmlrpclib.Fault(1, body)))
diff --git a/src/cherrypy/process/plugins.py b/src/cherrypy/process/plugins.py
index 7f3cde7ec8..0e8b4bf919 100644
--- a/src/cherrypy/process/plugins.py
+++ b/src/cherrypy/process/plugins.py
@@ -21,6 +21,7 @@ class SimplePlugin(object):
     def subscribe(self):
         """Register this object as a (multi-channel) listener on the bus."""
         for channel in self.bus.listeners:
+            # Subscribe self.start, self.exit, etc. if present.
             method = getattr(self, channel, None)
             if method is not None:
                 self.bus.subscribe(channel, method)
@@ -28,6 +29,7 @@ class SimplePlugin(object):
     def unsubscribe(self):
         """Unregister this object as a listener on the bus."""
         for channel in self.bus.listeners:
+            # Unsubscribe self.start, self.exit, etc. if present.
             method = getattr(self, channel, None)
             if method is not None:
                 self.bus.unsubscribe(channel, method)
@@ -213,9 +215,9 @@ class DropPrivileges(SimplePlugin):
             else:
                 self.bus.log('Started as uid: %r gid: %r' % current_ids())
                 if self.gid is not None:
-                    os.setgid(gid)
+                    os.setgid(self.gid)
                 if self.uid is not None:
-                    os.setuid(uid)
+                    os.setuid(self.uid)
                 self.bus.log('Running as uid: %r gid: %r' % current_ids())
         
         # umask
@@ -231,7 +233,10 @@ class DropPrivileges(SimplePlugin):
                              (old_umask, self.umask))
         
         self.finalized = True
-    start.priority = 75
+    # This is slightly higher than the priority for server.start
+    # in order to facilitate the most common use: starting on a low
+    # port (which requires root) and then dropping to another user.
+    start.priority = 77
 
 
 class Daemonizer(SimplePlugin):
diff --git a/src/cherrypy/process/servers.py b/src/cherrypy/process/servers.py
index f4baf83318..ac4178db0b 100644
--- a/src/cherrypy/process/servers.py
+++ b/src/cherrypy/process/servers.py
@@ -124,8 +124,16 @@ class FlupFCGIServer(object):
     """Adapter for a flup.server.fcgi.WSGIServer."""
     
     def __init__(self, *args, **kwargs):
+        self.args = args
+        self.kwargs = kwargs
+        self.ready = False
+    
+    def start(self):
+        """Start the FCGI server."""
+        # We have to instantiate the server class here because its __init__
+        # starts a threadpool. If we do it too early, daemonize won't work.
         from flup.server.fcgi import WSGIServer
-        self.fcgiserver = WSGIServer(*args, **kwargs)
+        self.fcgiserver = WSGIServer(*self.args, **self.kwargs)
         # TODO: report this bug upstream to flup.
         # If we don't set _oldSIGs on Windows, we get:
         #   File "C:\Python24\Lib\site-packages\flup\server\threadedserver.py",
@@ -135,11 +143,8 @@ class FlupFCGIServer(object):
         #   line 156, in _restoreSignalHandlers
         #     for signum,handler in self._oldSIGs:
         #   AttributeError: 'WSGIServer' object has no attribute '_oldSIGs'
+        self.fcgiserver._installSignalHandlers = lambda: None
         self.fcgiserver._oldSIGs = []
-        self.ready = False
-    
-    def start(self):
-        """Start the FCGI server."""
         self.ready = True
         self.fcgiserver.run()
     
@@ -152,6 +157,43 @@ class FlupFCGIServer(object):
         self.fcgiserver._threadPool.maxSpare = 0
 
 
+class FlupSCGIServer(object):
+    """Adapter for a flup.server.scgi.WSGIServer."""
+    
+    def __init__(self, *args, **kwargs):
+        self.args = args
+        self.kwargs = kwargs
+        self.ready = False
+    
+    def start(self):
+        """Start the SCGI server."""
+        # We have to instantiate the server class here because its __init__
+        # starts a threadpool. If we do it too early, daemonize won't work.
+        from flup.server.scgi import WSGIServer
+        self.scgiserver = WSGIServer(*self.args, **self.kwargs)
+        # TODO: report this bug upstream to flup.
+        # If we don't set _oldSIGs on Windows, we get:
+        #   File "C:\Python24\Lib\site-packages\flup\server\threadedserver.py",
+        #   line 108, in run
+        #     self._restoreSignalHandlers()
+        #   File "C:\Python24\Lib\site-packages\flup\server\threadedserver.py",
+        #   line 156, in _restoreSignalHandlers
+        #     for signum,handler in self._oldSIGs:
+        #   AttributeError: 'WSGIServer' object has no attribute '_oldSIGs'
+        self.scgiserver._installSignalHandlers = lambda: None
+        self.scgiserver._oldSIGs = []
+        self.ready = True
+        self.scgiserver.run()
+    
+    def stop(self):
+        """Stop the HTTP server."""
+        self.ready = False
+        # Forcibly stop the scgi server main event loop.
+        self.scgiserver._keepGoing = False
+        # Force all worker threads to die off.
+        self.scgiserver._threadPool.maxSpare = 0
+
+
 def client_host(server_host):
     """Return the host on which a client can connect to the given listener."""
     if server_host == '0.0.0.0':
diff --git a/src/cherrypy/process/win32.py b/src/cherrypy/process/win32.py
index 9db928da5a..0ca43d5e9b 100644
--- a/src/cherrypy/process/win32.py
+++ b/src/cherrypy/process/win32.py
@@ -71,8 +71,7 @@ class ConsoleCtrlHandler(plugins.SimplePlugin):
 class Win32Bus(wspbus.Bus):
     """A Web Site Process Bus implementation for Win32.
     
-    Instead of using time.sleep for blocking, this bus uses native
-    win32event objects. It also responds to console events.
+    Instead of time.sleep, this bus blocks using native win32event objects.
     """
     
     def __init__(self):
@@ -99,15 +98,21 @@ class Win32Bus(wspbus.Bus):
     state = property(_get_state, _set_state)
     
     def wait(self, state, interval=0.1):
-        """Wait for the given state, KeyboardInterrupt or SystemExit.
+        """Wait for the given state(s), KeyboardInterrupt or SystemExit.
         
         Since this class uses native win32event objects, the interval
         argument is ignored.
         """
-        # Don't wait for an event that beat us to the punch ;)
-        if self.state != state:
-            event = self._get_state_event(state)
-            win32event.WaitForSingleObject(event, win32event.INFINITE)
+        if isinstance(state, (tuple, list)):
+            # Don't wait for an event that beat us to the punch ;)
+            if self.state not in state:
+                events = tuple([self._get_state_event(s) for s in state])
+                win32event.WaitForMultipleObjects(events, 0, win32event.INFINITE)
+        else:
+            # Don't wait for an event that beat us to the punch ;)
+            if self.state != state:
+                event = self._get_state_event(state)
+                win32event.WaitForSingleObject(event, win32event.INFINITE)
 
 
 class _ControlCodes(dict):
diff --git a/src/cherrypy/process/wspbus.py b/src/cherrypy/process/wspbus.py
index 8c0d84bcbc..26abb4702c 100644
--- a/src/cherrypy/process/wspbus.py
+++ b/src/cherrypy/process/wspbus.py
@@ -153,9 +153,13 @@ class Bus(object):
                     e.code = 1
                 raise
             except:
-                self.log("Error in %r listener %r" % (channel, listener),
-                         level=40, traceback=True)
                 exc = sys.exc_info()[1]
+                if channel == 'log':
+                    # Assume any further messages to 'log' will fail.
+                    pass
+                else:
+                    self.log("Error in %r listener %r" % (channel, listener),
+                             level=40, traceback=True)
         if exc:
             raise
         return output
@@ -248,9 +252,14 @@ class Bus(object):
             self._do_execv()
     
     def wait(self, state, interval=0.1):
-        """Wait for the given state."""
+        """Wait for the given state(s)."""
+        if isinstance(state, (tuple, list)):
+            states = state
+        else:
+            states = [state]
+        
         def _wait():
-            while self.state != state:
+            while self.state not in states:
                 time.sleep(interval)
         
         # From http://psyco.sourceforge.net/psycoguide/bugs.html:
diff --git a/src/cherrypy/scaffold/__init__.py b/src/cherrypy/scaffold/__init__.py
new file mode 100644
index 0000000000..f50cc213d3
--- /dev/null
+++ b/src/cherrypy/scaffold/__init__.py
@@ -0,0 +1,61 @@
+"""<MyProject>, a CherryPy application.
+
+Use this as a base for creating new CherryPy applications. When you want
+to make a new app, copy and paste this folder to some other location
+(maybe site-packages) and rename it to the name of your project,
+then tweak as desired.
+
+Even before any tweaking, this should serve a few demonstration pages.
+Change to this directory and run:
+
+    python cherrypy\cherryd -c cherrypy\scaffold\site.conf
+
+"""
+
+import cherrypy
+from cherrypy import tools, url
+
+import os
+local_dir = os.path.join(os.getcwd(), os.path.dirname(__file__))
+
+
+class Root:
+    
+    _cp_config = {'tools.log_tracebacks.on': True,
+                  }
+    
+    def index(self):
+        return """<html>
+<body>Try some <a href='%s?a=7'>other</a> path,
+or a <a href='%s?n=14'>default</a> path.<br />
+Or, just look at the pretty picture:<br />
+<img src='%s' />
+</body></html>""" % (url("other"), url("else"),
+                     url("files/made_with_cherrypy_small.png"))
+    index.exposed = True
+    
+    def default(self, *args, **kwargs):
+        return "args: %s kwargs: %s" % (args, kwargs)
+    default.exposed = True
+    
+    def other(self, a=2, b='bananas', c=None):
+        cherrypy.response.headers['Content-Type'] = 'text/plain'
+        if c is None:
+            return "Have %d %s." % (int(a), b)
+        else:
+            return "Have %d %s, %s." % (int(a), b, c)
+    other.exposed = True
+    
+    files = cherrypy.tools.staticdir.handler(
+                section="/files",
+                dir=os.path.join(local_dir, "static"),
+                # Ignore .php files, etc.
+                match=r'\.(css|gif|html?|ico|jpe?g|js|png|swf|xml)$',
+                )
+
+
+root = Root()
+
+# Uncomment the following to use your own favicon instead of CP's default.
+#favicon_path = os.path.join(local_dir, "favicon.ico")
+#root.favicon_ico = tools.staticfile.handler(filename=favicon_path)
diff --git a/src/cherrypy/wsgiserver/__init__.py b/src/cherrypy/wsgiserver/__init__.py
index c3172c73ff..a92869f56d 100644
--- a/src/cherrypy/wsgiserver/__init__.py
+++ b/src/cherrypy/wsgiserver/__init__.py
@@ -88,6 +88,9 @@ try:
     import cStringIO as StringIO
 except ImportError:
     import StringIO
+
+_fileobject_uses_str_type = isinstance(socket._fileobject(None)._rbuf, basestring)
+
 import sys
 import threading
 import time
@@ -332,7 +335,12 @@ class HTTPRequest(object):
         
         environ = self.environ
         
-        method, path, req_protocol = request_line.strip().split(" ", 2)
+        try:
+            method, path, req_protocol = request_line.strip().split(" ", 2)
+        except ValueError:
+            self.simple_response(400, "Malformed Request-Line")
+            return
+        
         environ["REQUEST_METHOD"] = method
         
         # path may be an abs_path (including "http://host.domain.tld");
@@ -402,13 +410,6 @@ class HTTPRequest(object):
             self.simple_response("413 Request Entity Too Large")
             return
         
-        # Set AUTH_TYPE, REMOTE_USER
-        creds = environ.get("HTTP_AUTHORIZATION", "").split(" ", 1)
-        environ["AUTH_TYPE"] = creds[0]
-        if creds[0].lower() == 'basic':
-            user, pw = base64.decodestring(creds[1]).split(":", 1)
-            environ["REMOTE_USER"] = user
-        
         # Persistent connection support
         if self.response_protocol == "HTTP/1.1":
             # Both server and client are HTTP/1.1
@@ -588,7 +589,12 @@ class HTTPRequest(object):
         buf.append("\r\n")
         if msg:
             buf.append(msg)
-        self.wfile.sendall("".join(buf))
+        
+        try:
+            self.wfile.sendall("".join(buf))
+        except socket.error, x:
+            if x.args[0] not in socket_errors_to_ignore:
+                raise
     
     def start_response(self, status, headers, exc_info = None):
         """WSGI callable to begin the HTTP response."""
@@ -646,7 +652,8 @@ class HTTPRequest(object):
             if status < 200 or status in (204, 205, 304):
                 pass
             else:
-                if self.response_protocol == 'HTTP/1.1':
+                if (self.response_protocol == 'HTTP/1.1'
+                    and self.environ["REQUEST_METHOD"] != 'HEAD'):
                     # Use the chunked transfer-coding
                     self.chunked_write = True
                     self.outheaders.append(("Transfer-Encoding", "chunked"))
@@ -711,147 +718,327 @@ class FatalSSLAlert(Exception):
     pass
 
 
-class CP_fileobject(socket._fileobject):
-    """Faux file object attached to a socket object."""
-    
-    def sendall(self, data):
-        """Sendall for non-blocking sockets."""
-        while data:
-            try:
-                bytes_sent = self.send(data)
-                data = data[bytes_sent:]
-            except socket.error, e:
-                if e.args[0] not in socket_errors_nonblocking:
-                    raise
-    
-    def send(self, data):
-        return self._sock.send(data)
-    
-    def flush(self):
-        if self._wbuf:
-            buffer = "".join(self._wbuf)
-            self._wbuf = []
-            self.sendall(buffer)
-    
-    def recv(self, size):
-        while True:
-            try:
-                return self._sock.recv(size)
-            except socket.error, e:
-                if e.args[0] not in socket_errors_nonblocking:
-                    raise
-    
-    def read(self, size=-1):
-        if size < 0:
-            # Read until EOF
-            buffers = [self._rbuf]
-            self._rbuf = ""
-            if self._rbufsize <= 1:
-                recv_size = self.default_bufsize
-            else:
-                recv_size = self._rbufsize
-            
-            while True:
-                data = self.recv(recv_size)
-                if not data:
-                    break
-                buffers.append(data)
-            return "".join(buffers)
-        else:
-            # Read until size bytes or EOF seen, whichever comes first
-            data = self._rbuf
-            buf_len = len(data)
-            if buf_len >= size:
-                self._rbuf = data[size:]
-                return data[:size]
-            buffers = []
-            if data:
-                buffers.append(data)
-            self._rbuf = ""
-            while True:
-                left = size - buf_len
-                recv_size = max(self._rbufsize, left)
-                data = self.recv(recv_size)
-                if not data:
-                    break
-                buffers.append(data)
-                n = len(data)
-                if n >= left:
-                    self._rbuf = data[left:]
-                    buffers[-1] = data[:left]
-                    break
-                buf_len += n
-            return "".join(buffers)
+if not _fileobject_uses_str_type:
+    class CP_fileobject(socket._fileobject):
+        """Faux file object attached to a socket object."""
 
-    def readline(self, size=-1):
-        data = self._rbuf
-        if size < 0:
-            # Read until \n or EOF, whichever comes first
-            if self._rbufsize <= 1:
-                # Speed up unbuffered case
-                assert data == ""
-                buffers = []
-                while data != "\n":
-                    data = self.recv(1)
+        def sendall(self, data):
+            """Sendall for non-blocking sockets."""
+            while data:
+                try:
+                    bytes_sent = self.send(data)
+                    data = data[bytes_sent:]
+                except socket.error, e:
+                    if e.args[0] not in socket_errors_nonblocking:
+                        raise
+
+        def send(self, data):
+            return self._sock.send(data)
+
+        def flush(self):
+            if self._wbuf:
+                buffer = "".join(self._wbuf)
+                self._wbuf = []
+                self.sendall(buffer)
+
+        def recv(self, size):
+            while True:
+                try:
+                    return self._sock.recv(size)
+                except socket.error, e:
+                    if (e.args[0] not in socket_errors_nonblocking
+                        and e.args[0] not in socket_error_eintr):
+                        raise
+
+        def read(self, size=-1):
+            # Use max, disallow tiny reads in a loop as they are very inefficient.
+            # We never leave read() with any leftover data from a new recv() call
+            # in our internal buffer.
+            rbufsize = max(self._rbufsize, self.default_bufsize)
+            # Our use of StringIO rather than lists of string objects returned by
+            # recv() minimizes memory usage and fragmentation that occurs when
+            # rbufsize is large compared to the typical return value of recv().
+            buf = self._rbuf
+            buf.seek(0, 2)  # seek end
+            if size < 0:
+                # Read until EOF
+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
+                while True:
+                    data = self.recv(rbufsize)
+                    if not data:
+                        break
+                    buf.write(data)
+                return buf.getvalue()
+            else:
+                # Read until size bytes or EOF seen, whichever comes first
+                buf_len = buf.tell()
+                if buf_len >= size:
+                    # Already have size bytes in our buffer?  Extract and return.
+                    buf.seek(0)
+                    rv = buf.read(size)
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return rv
+
+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
+                while True:
+                    left = size - buf_len
+                    # recv() will malloc the amount of memory given as its
+                    # parameter even though it often returns much less data
+                    # than that.  The returned data string is short lived
+                    # as we copy it into a StringIO and free it.  This avoids
+                    # fragmentation issues on many platforms.
+                    data = self.recv(left)
+                    if not data:
+                        break
+                    n = len(data)
+                    if n == size and not buf_len:
+                        # Shortcut.  Avoid buffer data copies when:
+                        # - We have no data in our buffer.
+                        # AND
+                        # - Our call to recv returned exactly the
+                        #   number of bytes we were asked to read.
+                        return data
+                    if n == left:
+                        buf.write(data)
+                        del data  # explicit free
+                        break
+                    assert n <= left, "recv(%d) returned %d bytes" % (left, n)
+                    buf.write(data)
+                    buf_len += n
+                    del data  # explicit free
+                    #assert buf_len == buf.tell()
+                return buf.getvalue()
+
+        def readline(self, size=-1):
+            buf = self._rbuf
+            buf.seek(0, 2)  # seek end
+            if buf.tell() > 0:
+                # check if we already have it in our buffer
+                buf.seek(0)
+                bline = buf.readline(size)
+                if bline.endswith('\n') or len(bline) == size:
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return bline
+                del bline
+            if size < 0:
+                # Read until \n or EOF, whichever comes first
+                if self._rbufsize <= 1:
+                    # Speed up unbuffered case
+                    buf.seek(0)
+                    buffers = [buf.read()]
+                    self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
+                    data = None
+                    recv = self.recv
+                    while data != "\n":
+                        data = recv(1)
+                        if not data:
+                            break
+                        buffers.append(data)
+                    return "".join(buffers)
+
+                buf.seek(0, 2)  # seek end
+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    nl = data.find('\n')
+                    if nl >= 0:
+                        nl += 1
+                        buf.write(data[:nl])
+                        self._rbuf.write(data[nl:])
+                        del data
+                        break
+                    buf.write(data)
+                return buf.getvalue()
+            else:
+                # Read until size bytes or \n or EOF seen, whichever comes first
+                buf.seek(0, 2)  # seek end
+                buf_len = buf.tell()
+                if buf_len >= size:
+                    buf.seek(0)
+                    rv = buf.read(size)
+                    self._rbuf = StringIO.StringIO()
+                    self._rbuf.write(buf.read())
+                    return rv
+                self._rbuf = StringIO.StringIO()  # reset _rbuf.  we consume it via buf.
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    left = size - buf_len
+                    # did we just receive a newline?
+                    nl = data.find('\n', 0, left)
+                    if nl >= 0:
+                        nl += 1
+                        # save the excess data to _rbuf
+                        self._rbuf.write(data[nl:])
+                        if buf_len:
+                            buf.write(data[:nl])
+                            break
+                        else:
+                            # Shortcut.  Avoid data copy through buf when returning
+                            # a substring of our first recv().
+                            return data[:nl]
+                    n = len(data)
+                    if n == size and not buf_len:
+                        # Shortcut.  Avoid data copy through buf when
+                        # returning exactly all of our first recv().
+                        return data
+                    if n >= left:
+                        buf.write(data[:left])
+                        self._rbuf.write(data[left:])
+                        break
+                    buf.write(data)
+                    buf_len += n
+                    #assert buf_len == buf.tell()
+                return buf.getvalue()
+
+else:
+    class CP_fileobject(socket._fileobject):
+        """Faux file object attached to a socket object."""
+
+        def sendall(self, data):
+            """Sendall for non-blocking sockets."""
+            while data:
+                try:
+                    bytes_sent = self.send(data)
+                    data = data[bytes_sent:]
+                except socket.error, e:
+                    if e.args[0] not in socket_errors_nonblocking:
+                        raise
+
+        def send(self, data):
+            return self._sock.send(data)
+
+        def flush(self):
+            if self._wbuf:
+                buffer = "".join(self._wbuf)
+                self._wbuf = []
+                self.sendall(buffer)
+
+        def recv(self, size):
+            while True:
+                try:
+                    return self._sock.recv(size)
+                except socket.error, e:
+                    if (e.args[0] not in socket_errors_nonblocking
+                        and e.args[0] not in socket_error_eintr):
+                        raise
+
+        def read(self, size=-1):
+            if size < 0:
+                # Read until EOF
+                buffers = [self._rbuf]
+                self._rbuf = ""
+                if self._rbufsize <= 1:
+                    recv_size = self.default_bufsize
+                else:
+                    recv_size = self._rbufsize
+
+                while True:
+                    data = self.recv(recv_size)
                     if not data:
                         break
                     buffers.append(data)
                 return "".join(buffers)
-            nl = data.find('\n')
-            if nl >= 0:
-                nl += 1
-                self._rbuf = data[nl:]
-                return data[:nl]
-            buffers = []
-            if data:
-                buffers.append(data)
-            self._rbuf = ""
-            while True:
-                data = self.recv(self._rbufsize)
-                if not data:
-                    break
-                buffers.append(data)
+            else:
+                # Read until size bytes or EOF seen, whichever comes first
+                data = self._rbuf
+                buf_len = len(data)
+                if buf_len >= size:
+                    self._rbuf = data[size:]
+                    return data[:size]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    left = size - buf_len
+                    recv_size = max(self._rbufsize, left)
+                    data = self.recv(recv_size)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    n = len(data)
+                    if n >= left:
+                        self._rbuf = data[left:]
+                        buffers[-1] = data[:left]
+                        break
+                    buf_len += n
+                return "".join(buffers)
+
+        def readline(self, size=-1):
+            data = self._rbuf
+            if size < 0:
+                # Read until \n or EOF, whichever comes first
+                if self._rbufsize <= 1:
+                    # Speed up unbuffered case
+                    assert data == ""
+                    buffers = []
+                    while data != "\n":
+                        data = self.recv(1)
+                        if not data:
+                            break
+                        buffers.append(data)
+                    return "".join(buffers)
                 nl = data.find('\n')
                 if nl >= 0:
                     nl += 1
                     self._rbuf = data[nl:]
-                    buffers[-1] = data[:nl]
-                    break
-            return "".join(buffers)
-        else:
-            # Read until size bytes or \n or EOF seen, whichever comes first
-            nl = data.find('\n', 0, size)
-            if nl >= 0:
-                nl += 1
-                self._rbuf = data[nl:]
-                return data[:nl]
-            buf_len = len(data)
-            if buf_len >= size:
-                self._rbuf = data[size:]
-                return data[:size]
-            buffers = []
-            if data:
-                buffers.append(data)
-            self._rbuf = ""
-            while True:
-                data = self.recv(self._rbufsize)
-                if not data:
-                    break
-                buffers.append(data)
-                left = size - buf_len
-                nl = data.find('\n', 0, left)
+                    return data[:nl]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    nl = data.find('\n')
+                    if nl >= 0:
+                        nl += 1
+                        self._rbuf = data[nl:]
+                        buffers[-1] = data[:nl]
+                        break
+                return "".join(buffers)
+            else:
+                # Read until size bytes or \n or EOF seen, whichever comes first
+                nl = data.find('\n', 0, size)
                 if nl >= 0:
                     nl += 1
                     self._rbuf = data[nl:]
-                    buffers[-1] = data[:nl]
-                    break
-                n = len(data)
-                if n >= left:
-                    self._rbuf = data[left:]
-                    buffers[-1] = data[:left]
-                    break
-                buf_len += n
-            return "".join(buffers)
+                    return data[:nl]
+                buf_len = len(data)
+                if buf_len >= size:
+                    self._rbuf = data[size:]
+                    return data[:size]
+                buffers = []
+                if data:
+                    buffers.append(data)
+                self._rbuf = ""
+                while True:
+                    data = self.recv(self._rbufsize)
+                    if not data:
+                        break
+                    buffers.append(data)
+                    left = size - buf_len
+                    nl = data.find('\n', 0, left)
+                    if nl >= 0:
+                        nl += 1
+                        self._rbuf = data[nl:]
+                        buffers[-1] = data[:nl]
+                        break
+                    n = len(data)
+                    if n >= left:
+                        self._rbuf = data[left:]
+                        buffers[-1] = data[:left]
+                        break
+                    buf_len += n
+                return "".join(buffers)
     
 
 class SSL_fileobject(CP_fileobject):
@@ -1203,6 +1390,27 @@ class SSLConnection:
 """ % (f, f)
 
 
+try:
+    import fcntl
+except ImportError:
+    try:
+        from ctypes import windll, WinError
+    except ImportError:
+        def prevent_socket_inheritance(sock):
+            """Dummy function, since neither fcntl nor ctypes are available."""
+            pass
+    else:
+        def prevent_socket_inheritance(sock):
+            """Mark the given socket fd as non-inheritable (Windows)."""
+            if not windll.kernel32.SetHandleInformation(sock.fileno(), 1, 0):
+                raise WinError()
+else:
+    def prevent_socket_inheritance(sock):
+        """Mark the given socket fd as non-inheritable (POSIX)."""
+        fd = sock.fileno()
+        old_flags = fcntl.fcntl(fd, fcntl.F_GETFD)
+        fcntl.fcntl(fd, fcntl.F_SETFD, old_flags | fcntl.FD_CLOEXEC)
+
 
 class CherryPyWSGIServer(object):
     """An HTTP server for WSGI.
@@ -1249,7 +1457,7 @@ class CherryPyWSGIServer(object):
     
     protocol = "HTTP/1.1"
     _bind_addr = "127.0.0.1"
-    version = "CherryPy/3.1.0"
+    version = "CherryPy/3.1.1"
     ready = False
     _interrupt = None
     
@@ -1396,6 +1604,7 @@ class CherryPyWSGIServer(object):
     def bind(self, family, type, proto=0):
         """Create (or recreate) the actual socket object."""
         self.socket = socket.socket(family, type, proto)
+        prevent_socket_inheritance(self.socket)
         self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         if self.nodelay:
             self.socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
@@ -1409,12 +1618,25 @@ class CherryPyWSGIServer(object):
             ctx.use_certificate_file(self.ssl_certificate)
             self.socket = SSLConnection(ctx, self.socket)
             self.populate_ssl_environ()
+            
+            # If listening on the IPV6 any address ('::' = IN6ADDR_ANY),
+            # activate dual-stack. See http://www.cherrypy.org/ticket/871.
+            if (not isinstance(self.bind_addr, basestring)
+                and self.bind_addr[0] == '::' and family == socket.AF_INET6):
+                try:
+                    self.socket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, 0)
+                except (AttributeError, socket.error):
+                    # Apparently, the socket option is not available in
+                    # this machine's TCP stack
+                    pass
+        
         self.socket.bind(self.bind_addr)
     
     def tick(self):
         """Accept a new connection and put it on the Queue."""
         try:
             s, addr = self.socket.accept()
+            prevent_socket_inheritance(s)
             if not self.ready:
                 return
             if hasattr(s, 'settimeout'):
@@ -1423,7 +1645,8 @@ class CherryPyWSGIServer(object):
             environ = self.environ.copy()
             # SERVER_SOFTWARE is common for IIS. It's also helpful for
             # us to pass a default value for the "Server" response header.
-            environ["SERVER_SOFTWARE"] = "%s WSGI Server" % self.version
+            if environ.get("SERVER_SOFTWARE") is None:
+                environ["SERVER_SOFTWARE"] = "%s WSGI Server" % self.version
             # set a non-standard environ entry so the WSGI app can know what
             # the *real* server protocol is (and what features to support).
             # See http://www.faqs.org/rfcs/rfc2145.html.
diff --git a/src/odf/namespaces.py b/src/odf/namespaces.py
index 912d82d46b..3fb42af7c6 100644
--- a/src/odf/namespaces.py
+++ b/src/odf/namespaces.py
@@ -20,9 +20,10 @@
 TOOLSVERSION = u"ODFPY/0.8.1dev"
 
 ANIMNS         = u"urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
+DBNS           = u"urn:oasis:names:tc:opendocument:xmlns:database:1.0"
 CHARTNS        = u"urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
 CONFIGNS       = u"urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-DBNS           = u"http://openoffice.org/2004/database"
+#DBNS           = u"http://openoffice.org/2004/database"
 DCNS           = u"http://purl.org/dc/elements/1.1/"
 DOMNS          = u"http://www.w3.org/2001/xml-events"
 DR3DNS         = u"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
@@ -39,6 +40,7 @@ OOONS          = u"http://openoffice.org/2004/office"
 OOOWNS         = u"http://openoffice.org/2004/writer"
 OOOCNS         = u"http://openoffice.org/2004/calc"
 PRESENTATIONNS = u"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+RDFANS         = u"http://docs.oasis-open.org/opendocument/meta/rdfa#"
 SCRIPTNS       = u"urn:oasis:names:tc:opendocument:xmlns:script:1.0"
 SMILNS         = u"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
 STYLENS        = u"urn:oasis:names:tc:opendocument:xmlns:style:1.0"
@@ -47,6 +49,7 @@ TABLENS        = u"urn:oasis:names:tc:opendocument:xmlns:table:1.0"
 TEXTNS         = u"urn:oasis:names:tc:opendocument:xmlns:text:1.0"
 XFORMSNS       = u"http://www.w3.org/2002/xforms"
 XLINKNS        = u"http://www.w3.org/1999/xlink"
+XMLNS          = "http://www.w3.org/XML/1998/namespace"
 
 
 nsdict = {
@@ -70,6 +73,7 @@ nsdict = {
    OOOWNS: u'ooow',
    OOOCNS: u'ooc',
    PRESENTATIONNS: u'presentation',
+   RDFANS: u'rdfa',
    SCRIPTNS: u'script',
    SMILNS: u'smil',
    STYLENS: u'style',
@@ -78,4 +82,5 @@ nsdict = {
    TEXTNS: u'text',
    XFORMSNS: u'xforms',
    XLINKNS: u'xlink',
+   XMLNS: u'xml',
 }
diff --git a/src/odf/odf2xhtml.py b/src/odf/odf2xhtml.py
index 8042f0871f..8a55fbd036 100644
--- a/src/odf/odf2xhtml.py
+++ b/src/odf/odf2xhtml.py
@@ -22,7 +22,7 @@
 #pdb.set_trace()
 import zipfile
 import xml.sax
-from xml.sax import handler
+from xml.sax import handler, expatreader
 from xml.sax.xmlreader import InputSource
 from xml.sax.saxutils import escape, quoteattr
 
@@ -206,10 +206,10 @@ class StyleToCSS:
         if hpos == "center":
             sdict['margin-left'] = "auto"
             sdict['margin-right'] = "auto"
-        else:
-            # force it to be *something* then delete it
-            sdict['margin-left'] = sdict['margin-right'] = ''
-            del sdict['margin-left'], sdict['margin-right']
+#       else:
+#           # force it to be *something* then delete it
+#           sdict['margin-left'] = sdict['margin-right'] = ''
+#           del sdict['margin-left'], sdict['margin-right']
 
         if hpos in ("right","outside"):
             if wrap in ( "left", "parallel","dynamic"):
@@ -336,8 +336,9 @@ special_styles = {
 class ODF2XHTML(handler.ContentHandler):
     """ The ODF2XHTML parses an ODF file and produces XHTML"""
 
-    def __init__(self):
+    def __init__(self, generate_css=True, embedable=False):
         # Tags
+        self.generate_css = generate_css
         self.elements = {
         (DCNS, 'title'): (self.s_processcont, self.e_dc_title),
         (DCNS, 'language'): (self.s_processcont, self.e_dc_contentlanguage),
@@ -349,6 +350,7 @@ class ODF2XHTML(handler.ContentHandler):
         (DRAWNS, 'fill-image'): (self.s_draw_fill_image, None),
         (DRAWNS, "layer-set"):(self.s_ignorexml, None),
         (DRAWNS, 'page'): (self.s_draw_page, self.e_draw_page),
+        (DRAWNS, 'text-box'): (self.s_draw_textbox, self.e_draw_textbox),
         (METANS, 'creation-date'):(self.s_processcont, self.e_dc_metatag),
         (METANS, 'generator'):(self.s_processcont, self.e_dc_metatag),
         (METANS, 'initial-creator'): (self.s_processcont, self.e_dc_metatag),
@@ -421,6 +423,12 @@ class ODF2XHTML(handler.ContentHandler):
         (TEXTNS, "table-of-content-source"):(self.s_text_x_source, self.e_text_x_source),
         (TEXTNS, "user-index-source"):(self.s_text_x_source, self.e_text_x_source),
         }
+        if embedable:
+            self.elements[(OFFICENS, u"text")] = (None,None)
+            self.elements[(OFFICENS, u"spreadsheet")] = (None,None)
+            self.elements[(OFFICENS, u"presentation")] = (None,None)
+            self.elements[(OFFICENS, u"document-content")] = (None,None)
+
 
     def writeout(self, s):
         if s != '':
@@ -548,14 +556,18 @@ class ODF2XHTML(handler.ContentHandler):
         """ A <draw:frame> is made into a <div> in HTML which is then styled
         """
         anchor_type = attrs.get((TEXTNS,'anchor-type'),'char')
+        htmltag = 'div'
         name = "G-" + attrs.get( (DRAWNS,'style-name'), "")
         if name == 'G-':
             name = "PR-" + attrs.get( (PRESENTATIONNS,'style-name'), "")
         name = name.replace(".","_")
         if anchor_type == "paragraph":
-            style = ""
+            style = 'position:relative;'
         elif anchor_type == 'char':
-            style = "position: relative;"
+            style = "position:relative;"
+        elif anchor_type == 'as-char':
+            htmltag = 'div'
+            style = ''
         else:
             style = "position: absolute;"
         if attrs.has_key( (SVGNS,"width") ):
@@ -566,7 +578,10 @@ class ODF2XHTML(handler.ContentHandler):
             style = style + "left:" +  attrs[(SVGNS,"x")] + ";"
         if attrs.has_key( (SVGNS,"y") ):
             style = style + "top:" +  attrs[(SVGNS,"y")] + ";"
-        self.opentag('div', {'class': name, 'style': style})
+        if self.generate_css:
+            self.opentag(htmltag, {'class': name, 'style': style})
+        else:
+            self.opentag(htmltag)
 
     def e_draw_frame(self, tag, attrs):
         """ End the <draw:frame>
@@ -593,8 +608,9 @@ class ODF2XHTML(handler.ContentHandler):
         imghref = attrs[(XLINKNS,"href")]
         imghref = self.rewritelink(imghref)
         htmlattrs = {'alt':"", 'src':imghref }
-        if anchor_type != "char":
-            htmlattrs['style'] = "display: block;"
+        if self.generate_css:
+            if anchor_type != "char":
+                htmlattrs['style'] = "display: block;"
         self.emptytag('img', htmlattrs)
 
     def s_draw_page(self, tag, attrs):
@@ -607,7 +623,10 @@ class ODF2XHTML(handler.ContentHandler):
         stylename = stylename.replace(".","_")
         masterpage = attrs.get( (DRAWNS,'master-page-name'),"")
         masterpage = masterpage.replace(".","_")
-        self.opentag('fieldset', {'class':"DP-%s MP-%s" % (stylename, masterpage) })
+        if self.generate_css:
+            self.opentag('fieldset', {'class':"DP-%s MP-%s" % (stylename, masterpage) })
+        else:
+            self.opentag('fieldset')
         self.opentag('legend')
         self.writeout(escape(name))
         self.closetag('legend')
@@ -615,17 +634,30 @@ class ODF2XHTML(handler.ContentHandler):
     def e_draw_page(self, tag, attrs):
         self.closetag('fieldset')
 
+    def s_draw_textbox(self, tag, attrs):
+        style = ''
+        if attrs.has_key( (FONS,"min-height") ):
+            style = style + "min-height:" +  attrs[(FONS,"min-height")] + ";"
+        self.opentag('div')
+#       self.opentag('div', {'style': style})
+
+    def e_draw_textbox(self, tag, attrs):
+        """ End the <draw:text-box>
+        """
+        self.closetag('div')
+
     def html_body(self, tag, attrs):
         self.writedata()
-        self.opentag('style', {'type':"text/css"}, True)
-        self.writeout('/*<![CDATA[*/\n')
-        self.writeout('\nimg { width: 100%; height: 100%; }\n')
-        self.writeout('* { padding: 0; margin: 0; }\n')
-        self.writeout('body { margin: 0 1em; }\n')
-        self.writeout('ol, ul { padding-left: 2em; }\n')
-        self.generate_stylesheet()
-        self.writeout('/*]]>*/\n')
-        self.closetag('style')
+        if self.generate_css:
+            self.opentag('style', {'type':"text/css"}, True)
+            self.writeout('/*<![CDATA[*/\n')
+            self.writeout('\nimg { width: 100%; height: 100%; }\n')
+            self.writeout('* { padding: 0; margin: 0;  background-color:white; }\n')
+            self.writeout('body { margin: 0 1em; }\n')
+            self.writeout('ol, ul { padding-left: 2em; }\n')
+            self.generate_stylesheet()
+            self.writeout('/*]]>*/\n')
+            self.closetag('style')
         self.purgedata()
         self.closetag('head')
         self.opentag('body', block=True)
@@ -660,7 +692,10 @@ class ODF2XHTML(handler.ContentHandler):
     def generate_footnotes(self):
         if self.currentnote == 0:
             return
-        self.opentag('ol', {'style':'border-top: 1px solid black'}, True)
+        if self.generate_css:
+            self.opentag('ol', {'style':'border-top: 1px solid black'}, True)
+        else:
+            self.opentag('ol')
         for key in range(1,self.currentnote+1):
             note = self.notedict[key]
 #       for key,note in self.notedict.items():
@@ -731,6 +766,8 @@ class ODF2XHTML(handler.ContentHandler):
         """ Copy all attributes to a struct.
             We will later convert them to CSS2
         """
+        if self.currentstyle is None:
+            return
         for key,attr in attrs.items():
             self.styledict[self.currentstyle][key] = attr
 
@@ -874,7 +911,7 @@ class ODF2XHTML(handler.ContentHandler):
         """ Start a table
         """
         c = attrs.get( (TABLENS,'style-name'), None)
-        if c:
+        if c and self.generate_css:
             c = c.replace(".","_")
             self.opentag('table',{ 'class': "T-%s" % c })
         else:
@@ -958,7 +995,7 @@ class ODF2XHTML(handler.ContentHandler):
         for x in range(level + 1,10):
             self.headinglevels[x] = 0
         special = special_styles.get("P-"+name)
-        if special:
+        if special or not self.generate_css:
             self.opentag('h%s' % level)
         else:
             self.opentag('h%s' % level, {'class':"P-%s" % name })
@@ -997,7 +1034,10 @@ class ODF2XHTML(handler.ContentHandler):
             # textbox itself may be nested within another list.
             level = self.tagstack.count_tags(tag) + 1
             name = self.tagstack.rfindattr( (TEXTNS,'style-name') )
-        self.opentag('%s' % self.listtypes.get(name), {'class':"%s_%d" % (name, level) })
+        if self.generate_css:
+            self.opentag('%s' % self.listtypes.get(name), {'class':"%s_%d" % (name, level) })
+        else:
+            self.opentag('%s' % self.listtypes.get(name))
         self.purgedata()
 
     def e_text_list(self, tag, attrs):
@@ -1113,7 +1153,8 @@ class ODF2XHTML(handler.ContentHandler):
             specialtag = special_styles.get("P-"+c)
             if specialtag is None:
                 specialtag = 'p'
-                htmlattrs['class'] = "P-%s" % c
+                if self.generate_css:
+                    htmlattrs['class'] = "P-%s" % c
         self.opentag(specialtag, htmlattrs)
         self.purgedata()
 
@@ -1149,7 +1190,7 @@ class ODF2XHTML(handler.ContentHandler):
         if c:
             c = c.replace(".","_")
             special = special_styles.get("S-"+c)
-            if special is None:
+            if special is None and self.generate_css:
                 htmlattrs['class'] = "S-%s" % c
         self.opentag('span', htmlattrs)
         self.purgedata()
@@ -1219,7 +1260,10 @@ class ODF2XHTML(handler.ContentHandler):
         # Extract the interesting files
         z = zipfile.ZipFile(self._odffile)
 
-        parser = xml.sax.make_parser()
+        # For some reason Trac has trouble when xml.sax.make_parser() is used.
+        # Could it be because PyXML is installed, and therefore a different parser
+        # might be chosen? By calling expatreader directly we avoid this issue
+        parser = expatreader.create_parser()
         parser.setFeature(handler.feature_namespaces, 1)
         parser.setContentHandler(self)
         parser.setErrorHandler(handler.ErrorHandler())
diff --git a/src/odf/opendocument.py b/src/odf/opendocument.py
index aa2ed9aaaf..784ff70292 100644
--- a/src/odf/opendocument.py
+++ b/src/odf/opendocument.py
@@ -287,7 +287,7 @@ class OpenDocument:
             else:
                 ext = mimetypes.guess_extension(mediatype)
             manifestfn = "Pictures/%0.0f%s" % ((time.time()*10000000000), ext)
-            self.Pictures[manifestfn] = (IS_FILENAME, fileobj, mediatype)
+            self.Pictures[manifestfn] = (IS_FILENAME, filename, mediatype)
         else:
             manifestfn = filename
             self.Pictures[manifestfn] = (IS_IMAGE, content, mediatype)
diff --git a/src/pyPdf/pdf.py b/src/pyPdf/pdf.py
index ce4331b498..3cf7a60f0e 100644
--- a/src/pyPdf/pdf.py
+++ b/src/pyPdf/pdf.py
@@ -49,7 +49,7 @@ import utils
 import warnings
 from generic import *
 from utils import readNonWhitespace, readUntilWhitespace, ConvertFunctionsToVirtualList
-from sets import ImmutableSet
+
 
 ##
 # This class supports writing PDF files out, given pages produced by another
@@ -986,8 +986,8 @@ class PageObject(DictionaryObject):
 
         # Combine /ProcSet sets.
         newResources[NameObject("/ProcSet")] = ArrayObject(
-            ImmutableSet(originalResources.get("/ProcSet", ArrayObject()).getObject()).union(
-                ImmutableSet(page2Resources.get("/ProcSet", ArrayObject()).getObject())
+            frozenset(originalResources.get("/ProcSet", ArrayObject()).getObject()).union(
+                frozenset(page2Resources.get("/ProcSet", ArrayObject()).getObject())
             )
         )
 
diff --git a/todo-2.6 b/todo-2.6
new file mode 100644
index 0000000000..33b5a5e428
--- /dev/null
+++ b/todo-2.6
@@ -0,0 +1,7 @@
+
+* Refactor web.fetch.simple to use per connection timeouts via the timeout kwarg for mechanize.open
+
+* Refactor IPC code to use communication logic from multiprocessing
+
+* Use multiprocessing for cpu_count instead of QThread
+
diff --git a/upload.py b/upload.py
index 9797f3dde8..fb88efc149 100644
--- a/upload.py
+++ b/upload.py
@@ -13,7 +13,10 @@ def get_ip_address(ifname):
         struct.pack('256s', ifname[:15])
     )[20:24])
 
-HOST=get_ip_address('eth0')
+try:
+    HOST=get_ip_address('eth0')
+except:
+    HOST=get_ip_address('wlan0')
 PROJECT=os.path.basename(os.getcwd())
 
 from calibre import __version__, __appname__
@@ -99,15 +102,12 @@ def build_osx(shutdown=True):
     return os.path.basename(installer)
 
 
-def build_linux(shutdown=True):
+def build_linux(*args, **kwargs):
     installer = installer_name('tar.bz2')
-    vm = '/vmware/linux/libprs500-gentoo.vmx'
-    start_vm(vm, 'linux', (BUILD_SCRIPT%('sudo python setup.py develop', 'python','installer/linux/freeze.py')).replace('rm ', 'sudo rm '), sleep=120)
-    subprocess.check_call(('scp', 'linux:/tmp/%s'%os.path.basename(installer), 'dist'))
+    exec open('installer/linux/freeze.py')
+    freeze()
     if not os.path.exists(installer):
         raise Exception('Failed to build installer '+installer)
-    if shutdown:
-        subprocess.Popen(('ssh', 'linux', 'sudo', '/sbin/poweroff'))
     return os.path.basename(installer)
 
 def build_installers():
@@ -213,11 +213,11 @@ def upload_src_tarball():
     check_call('scp dist/calibre-*.tar.gz divok:%s/'%DOWNLOADS)
 
 def stage_one():
-    check_call('sudo rm -rf build', shell=True)
+    check_call('sudo rm -rf build src/calibre/plugins/*', shell=True)
     os.mkdir('build')
     shutil.rmtree('docs')
     os.mkdir('docs')
-    check_call('python setup.py build', shell=True)
+    check_call('python setup.py build_ext build', shell=True)
     check_call('sudo python setup.py develop', shell=True)
     tag_release()
     upload_demo()
@@ -235,7 +235,12 @@ def stage_three():
     print 'Uploading to PyPI...'
     check_call('rm -f dist/*')
     check_call('python setup.py register')
-    check_call('python setup.py bdist_egg --exclude-source-files upload')
+    check_call('sudo rm -rf build src/calibre/plugins/*')
+    os.mkdir('build')
+    check_call('python2.5 setup.py build_ext bdist_egg --exclude-source-files upload')
+    check_call('sudo rm -rf build src/calibre/plugins/*')
+    os.mkdir('build')
+    check_call('python setup.py build_ext bdist_egg --exclude-source-files upload')
     check_call('python setup.py sdist upload')
     upload_src_tarball()
     check_call('''rm -rf dist/* build/*''')