From 1406021709dc33c958f93622aab83ffa03155771 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 06:47:21 -0600
Subject: [PATCH 01/12] Add an output profile for the 5-inch JetBook. Fix #2950
 (ebook-meta.exe 0.6.0 doesn't work at all)

---
 src/calibre/customize/profiles.py  | 13 ++++++++++++-
 src/calibre/ebooks/metadata/cli.py | 18 ++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index a6ffc2f243..757cd09b19 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -199,6 +199,17 @@ class SonyReaderOutput(OutputProfile):
     fbase                     = 12
     fsizes                    = [7.5, 9, 10, 12, 15.5, 20, 22, 24]
 
+class JetBook5Output(OutputProfile):
+
+    name        = 'JetBook 5-inch'
+    short_name  = 'jetbook5'
+    description = _('This profile is intended for the 5-inch JetBook.')
+
+    screen_size               = (480, 640)
+    dpi                       = 168.451
+
+
+
 class SonyReaderLandscapeOutput(SonyReaderOutput):
 
     name        = 'Sony Reader Landscape'
@@ -334,4 +345,4 @@ class IRexDR1000Output(OutputProfile):
 output_profiles = [OutputProfile, SonyReaderOutput, MSReaderOutput,
         MobipocketOutput, HanlinV3Output, CybookG3Output, CybookOpusOutput,
         KindleOutput, SonyReaderLandscapeOutput, KindleDXOutput, IlliadOutput,
-        IRexDR1000Output]
+        IRexDR1000Output, JetBook5Output]
diff --git a/src/calibre/ebooks/metadata/cli.py b/src/calibre/ebooks/metadata/cli.py
index 33a330e2c9..18c3644eef 100644
--- a/src/calibre/ebooks/metadata/cli.py
+++ b/src/calibre/ebooks/metadata/cli.py
@@ -6,6 +6,16 @@ __docformat__ = 'restructuredtext en'
 '''
 ebook-meta
 '''
+import sys, os
+
+from calibre.utils.config import StringConfig
+from calibre.customize.ui import metadata_readers, metadata_writers
+from calibre.ebooks.metadata.meta import get_metadata, set_metadata
+from calibre.ebooks.metadata import string_to_authors, authors_to_sort_string, \
+                    title_sort, MetaInformation
+from calibre.ebooks.lrf.meta import LRFMetaFile
+from calibre import prints
+
 USAGE='%%prog ebook_file [' + _('options') + ']\n' + \
 _('''
 Read/Write metadata from/to ebook files.
@@ -19,15 +29,7 @@ some metadata on a file type that does not support it, the metadata will be
 silently ignored.
 ''')
 
-import sys, os
 
-from calibre.utils.config import StringConfig
-from calibre.customize.ui import metadata_readers, metadata_writers
-from calibre.ebooks.metadata.meta import get_metadata, set_metadata
-from calibre.ebooks.metadata import string_to_authors, authors_to_sort_string, \
-                    title_sort, MetaInformation
-from calibre.ebooks.lrf.meta import LRFMetaFile
-from calibre import prints
 
 def config():
     c = StringConfig('')

From 090b322f8da5b3413169817407ed938932bac542 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 08:50:24 -0600
Subject: [PATCH 02/12] EPUB Output: Fix default cover page to display
 correctly In Adobe Digital Editions

---
 src/calibre/ebooks/epub/output.py | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/calibre/ebooks/epub/output.py b/src/calibre/ebooks/epub/output.py
index 6e09c7e6d9..9280aec85c 100644
--- a/src/calibre/ebooks/epub/output.py
+++ b/src/calibre/ebooks/epub/output.py
@@ -108,11 +108,16 @@ class EPUBOutput(OutputFormatPlugin):
         <title>%(title)s</title>
         <style type="text/css">
             body {
-                background: white no-repeat fixed center center;
                 text-align: center;
                 vertical-align: center;
                 overflow: hidden;
-                font-size: 18px;
+                font-size: 16pt;
+            }
+            .logo {
+                width: 510px; height: 390px;
+                text-align:center;
+                font-size: 1pt;
+                overflow:hidden;
             }
             h1 { font-family: serif; }
             h2, h4 { font-family: monospace; }
@@ -120,19 +125,9 @@ class EPUBOutput(OutputFormatPlugin):
     </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>
+        <img class="logo" src="%(img)s" alt="calibre logo" />
+        <h2>%(author)s</h2>
+        <h4>Produced by %(app)s</h4>
     </body>
 </html>
 '''
@@ -211,8 +206,9 @@ class EPUBOutput(OutputFormatPlugin):
                 'calibre-logo.png')
         self.oeb.manifest.add(id, href, 'image/png', data=img_data)
         title, author = map(prepare_string_for_xml, (title, author))
+        if not author or not author.strip():
+            author = strftime('%d %b, %Y')
         html = self.TITLEPAGE%dict(title=title, author=author,
-                date=strftime('%d %b, %Y'),
                 app=__appname__ +' '+__version__,
                 img=href)
         id, href = self.oeb.manifest.generate('calibre-titlepage',

From 2330c2a88e239c6d87e2e15dfc1bd1ca3cda194f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 09:06:00 -0600
Subject: [PATCH 03/12] =?UTF-8?q?Fix=20#2953=20(missing=20=C3=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/calibre/ebooks/mobi/reader.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/calibre/ebooks/mobi/reader.py b/src/calibre/ebooks/mobi/reader.py
index eed42bce46..4a828952d8 100644
--- a/src/calibre/ebooks/mobi/reader.py
+++ b/src/calibre/ebooks/mobi/reader.py
@@ -303,7 +303,12 @@ class MobiReader(object):
         self.cleanup_html()
 
         self.log.debug('Parsing HTML...')
-        root = html.fromstring(self.processed_html)
+        try:
+            root = html.fromstring(self.processed_html)
+        except:
+            self.log.warning('MOBI markup appears to contain random bytes. Stripping.')
+            self.processed_html = self.remove_random_bytes(self.processed_html)
+            root = html.fromstring(self.processed_html)
         if root.xpath('descendant::p/descendant::p'):
             from lxml.html import soupparser
             self.log.warning('Malformed markup, parsing using BeautifulSoup')
@@ -444,7 +449,10 @@ class MobiReader(object):
             self.processed_html = '<html><p>' + self.processed_html.replace('\n\n', '<p>') + '</html>'
         self.processed_html = self.processed_html.replace('\r\n', '\n')
         self.processed_html = self.processed_html.replace('> <', '>\n<')
-        self.processed_html = re.sub('\x14|\x15|\x1c|\x1d|\xef|\x12|\x13|\xec', '', self.processed_html)
+
+    def remove_random_bytes(self, html):
+            return re.sub('\x14|\x15|\x1c|\x1d|\xef|\x12|\x13|\xec',
+                    '', html)
 
     def ensure_unit(self, raw, unit='px'):
         if re.search(r'\d+$', raw) is not None:

From 74875fff9788141ea1613eed3d8617576a2a45d6 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 09:31:45 -0600
Subject: [PATCH 04/12] Make handling of malformed/fragmentary HTML more robust

---
 src/calibre/ebooks/oeb/base.py | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 03d45a3dad..1f2df923dc 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -815,15 +815,28 @@ class Manifest(object):
                             data = etree.fromstring(data, parser=RECOVER_PARSER)
                 return data
             data = first_pass(data)
-            # Force into the XHTML namespace
+
+            # Handle weird (non-HTML/fragment) files
             if barename(data.tag) != 'html':
                 self.oeb.log.warn('File %r does not appear to be (X)HTML'%self.href)
                 nroot = etree.fromstring('<html></html>')
+                has_body = False
+                for child in list(data):
+                    if barename(child.tag) == 'body':
+                        has_body = True
+                        break
+                parent = nroot
+                if not has_body:
+                    self.oeb.log.warn('File %r appears to be a HTML fragment'%self.href)
+                    nroot = etree.fromstring('<html><body/></html>')
+                    parent = nroot[0]
                 for child in list(data):
                     child.getparent().remove(child)
-                    nroot.append(child)
+                    parent.append(child)
                 data = nroot
-            elif not namespace(data.tag):
+
+            # Force into the XHTML namespace
+            if not namespace(data.tag):
                 data.attrib['xmlns'] = XHTML_NS
                 data = etree.tostring(data, encoding=unicode)
                 try:

From 7a3db36c9a5ad89a92c3f3d5ecce5d9148f6171e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 11:58:49 -0600
Subject: [PATCH 05/12] Fix #2904 (created epub from odt file, tested in
 epubcheck, errors on images)

---
 src/calibre/ebooks/odt/input.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/calibre/ebooks/odt/input.py b/src/calibre/ebooks/odt/input.py
index 7d6498ab81..28e7044201 100644
--- a/src/calibre/ebooks/odt/input.py
+++ b/src/calibre/ebooks/odt/input.py
@@ -64,4 +64,15 @@ class ODTInput(InputFormatPlugin):
                 accelerators):
         return Extract()(stream, '.')
 
+    def postprocess_book(self, oeb, opts, log):
+        # Fix <p><div> constructs as the asinine epubchecker complains
+        # about them
+        from calibre.ebooks.oeb.base import XPath, XHTML
+        path = XPath('//h:p/h:div')
+        for item in oeb.spine:
+            root = item.data
+            if not hasattr(root, 'xpath'): continue
+            for div in path(root):
+                div.getparent().tag = XHTML('div')
+
 

From ddc22b24803190e8de6cf3eb06c9310186c92a6b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 11:59:32 -0600
Subject: [PATCH 06/12] Fix one final case that could cause 'Unknown' to show
 up in the authors list even when authors are specified

---
 src/calibre/ebooks/oeb/transforms/metadata.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/ebooks/oeb/transforms/metadata.py b/src/calibre/ebooks/oeb/transforms/metadata.py
index 96698b2db6..9733faf487 100644
--- a/src/calibre/ebooks/oeb/transforms/metadata.py
+++ b/src/calibre/ebooks/oeb/transforms/metadata.py
@@ -19,7 +19,7 @@ def meta_info_to_oeb_metadata(mi, m, log):
             m.add('title', mi.title_sort)
         m.title[0].file_as = mi.title_sort
     if mi.authors:
-        m.filter('creator', lambda x : x.role.lower() == 'aut')
+        m.filter('creator', lambda x : x.role.lower() in ['aut', ''])
         for a in mi.authors:
             attrib = {'role':'aut'}
             if mi.author_sort:

From 81d70b68d9a725653d73a89d175bdf30931f09f3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 12:06:16 -0600
Subject: [PATCH 07/12] EPUB Output: Fix generated OPF to be compatible with
 the asinine epubchecker. Also fix bug that was causing the default cover to
 use the date even when authors are present.

---
 src/calibre/ebooks/epub/output.py | 6 ++++--
 src/calibre/ebooks/oeb/base.py    | 1 -
 src/calibre/ebooks/oeb/output.py  | 6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/calibre/ebooks/epub/output.py b/src/calibre/ebooks/epub/output.py
index 9280aec85c..18009a9a9f 100644
--- a/src/calibre/ebooks/epub/output.py
+++ b/src/calibre/ebooks/epub/output.py
@@ -125,7 +125,9 @@ class EPUBOutput(OutputFormatPlugin):
     </head>
     <body>
         <h1>%(title)s</h1>
-        <img class="logo" src="%(img)s" alt="calibre logo" />
+        <div style="text-align:center">
+            <img class="logo" src="%(img)s" alt="calibre logo" />
+        </div>
         <h2>%(author)s</h2>
         <h4>Produced by %(app)s</h4>
     </body>
@@ -196,7 +198,7 @@ class EPUBOutput(OutputFormatPlugin):
         images_rc
         m = self.oeb.metadata
         title = unicode(m.title[0])
-        a = [unicode(x) for x in m.creators if m.role == 'aut']
+        a = [unicode(x) for x in m.creator if x.role == 'aut']
         author = authors_to_string(a)
         if QApplication.instance() is None: QApplication([])
         f = QFile(':/library')
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 1f2df923dc..8941f97304 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -694,7 +694,6 @@ class Metadata(object):
     def to_opf2(self, parent=None):
         nsmap = self._opf2_nsmap
         nsrmap = dict((value, key) for key, value in nsmap.items())
-        nsmap.pop('opf', '')
         elem = element(parent, OPF('metadata'), nsmap=nsmap)
         for term in self.items:
             for item in self.items[term]:
diff --git a/src/calibre/ebooks/oeb/output.py b/src/calibre/ebooks/oeb/output.py
index 4df8c0f679..123d485b00 100644
--- a/src/calibre/ebooks/oeb/output.py
+++ b/src/calibre/ebooks/oeb/output.py
@@ -3,7 +3,7 @@ __license__ = 'GPL 3'
 __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
-import os
+import os, re
 
 from lxml import etree
 
@@ -34,6 +34,10 @@ class OEBOutput(OutputFormatPlugin):
                 if root is not None:
                     raw = etree.tostring(root, pretty_print=True,
                             encoding='utf-8', xml_declaration=True)
+                    if key == OPF_MIME:
+                        # Needed as I can't get lxml to output opf:role and
+                        # not output <opf:metadata> as well
+                        raw = re.sub(r'(<[/]{0,1})opf:', r'\1', raw)
                     with open(href, 'wb') as f:
                         f.write(raw)
 

From 4dc60240c1cf364ed54ff6c85bda8f7b1bec7628 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 12:24:10 -0600
Subject: [PATCH 08/12] Fix #2920 (Ebook viewer not working)

---
 src/calibre/gui2/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 3da3a33c69..3daa659f73 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -1409,7 +1409,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                         self.view_format(row, format)
                         break
                 if not in_prefs:
-                    self.view_format(row, format[0])
+                    self.view_format(row, formats[0])
         else:
             paths = self.current_view().model().paths(rows)
             for path in paths:

From 9bc7b7feed710beec1484e0fc0e5253cb43c359d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 14:16:08 -0600
Subject: [PATCH 09/12] Fix #2954 (No header, extra line at bottom.)

---
 src/calibre/gui2/tools.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/gui2/tools.py b/src/calibre/gui2/tools.py
index d146f2ab5e..25c7a7f363 100644
--- a/src/calibre/gui2/tools.py
+++ b/src/calibre/gui2/tools.py
@@ -166,6 +166,11 @@ def fetch_scheduled_recipe(recipe, script):
         recs.append(('base_font_size', lf['base_font_size'],
             OptionRecommendation.HIGH))
 
+    lr = load_defaults('lrf_output')
+    if lr.get('header', False):
+        recs.append(('header', True, OptionRecommendation.HIGH))
+        recs.append(('header_format', '%t', OptionRecommendation.HIGH))
+
     args = [script, pt.name, recs]
     if recipe.needs_subscription:
         x = config.get('recipe_account_info_%s'%recipe.id, False)

From 1b39011adf7998007cd7ed40f24c6dc1345ce3fd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 14:47:04 -0600
Subject: [PATCH 10/12] Fix #2807 ("Reset Quick Search" button does not reset
 the status of the tag toggle switches)

---
 src/calibre/gui2/library.py  | 1 +
 src/calibre/gui2/main.py     | 1 +
 src/calibre/gui2/tag_view.py | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 7d3f8c5742..fca324fe4c 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -1128,6 +1128,7 @@ class SearchBox(QLineEdit):
         self.home(False)
         self.initial_state = True
         self.setStyleSheet("background-color: white")
+        self.emit(SIGNAL('cleared()'))
 
     def clear(self):
         self.clear_to_help()
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 3daa659f73..2241c5bf07 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -456,6 +456,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 SIGNAL('count_changed(int)'), self.location_view.count_changed)
         self.connect(self.library_view.model(), SIGNAL('count_changed(int)'),
                      self.tags_view.recount)
+        self.connect(self.search, SIGNAL('cleared()'), self.tags_view.clear)
         self.library_view.model().count_changed()
         ########################### Cover Flow ################################
         self.cover_flow = None
diff --git a/src/calibre/gui2/tag_view.py b/src/calibre/gui2/tag_view.py
index 7d9f435fa9..2e8bf3c910 100644
--- a/src/calibre/gui2/tag_view.py
+++ b/src/calibre/gui2/tag_view.py
@@ -36,6 +36,9 @@ class TagsView(QTreeView):
             self.emit(SIGNAL('tags_marked(PyQt_PyObject, PyQt_PyObject)'),
                       self._model.tokens(), self.match_all.isChecked())
 
+    def clear(self):
+        self.model().clear_state()
+
     def recount(self, *args):
         ci = self.currentIndex()
         if not ci.isValid():
@@ -119,6 +122,11 @@ class TagsModel(QStandardItemModel):
                 self._data[category], self.cmap[r], self.bold_font, self.icon_map))
         #self.reset()
 
+    def clear_state(self):
+        for category in self._data.values():
+            for tag in category:
+                tag.state = 0
+        self.refresh()
 
     def reinit(self, *args, **kwargs):
         if not self.ignore_next_search:

From c42b5a07758de8f54d0adfdf301e2d2feb51777c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 15:34:43 -0600
Subject: [PATCH 11/12] version 0.6.2

---
 src/calibre/constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 62f724b7b4..01bfc4ca0b 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.6.1'
+__version__   = '0.6.2'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re

From 4def7e4f9b0b7b03caf77b9668a8ba61ab2094e4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 27 Jul 2009 15:36:59 -0600
Subject: [PATCH 12/12] IGN:Tag release

---
 src/calibre/translations/calibre.pot | 450 ++++++++++++++-------------
 1 file changed, 236 insertions(+), 214 deletions(-)

diff --git a/src/calibre/translations/calibre.pot b/src/calibre/translations/calibre.pot
index c0c261702a..5f982dcb21 100644
--- a/src/calibre/translations/calibre.pot
+++ b/src/calibre/translations/calibre.pot
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: calibre 0.6.1\n"
-"POT-Creation-Date: 2009-07-26 18:32+MDT\n"
-"PO-Revision-Date: 2009-07-26 18:32+MDT\n"
+"Project-Id-Version: calibre 0.6.2\n"
+"POT-Creation-Date: 2009-07-27 15:35+MDT\n"
+"PO-Revision-Date: 2009-07-27 15:35+MDT\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: LANGUAGE\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:57
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:58
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:199
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:645
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:649
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:646
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:650
 #: /home/kovid/work/calibre/src/calibre/ebooks/comic/input.py:403
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:66
 #: /home/kovid/work/calibre/src/calibre/ebooks/fb2/input.py:68
@@ -61,13 +61,13 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:79
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:118
 #: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:151
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:553
-#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:737
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:561
+#: /home/kovid/work/calibre/src/calibre/ebooks/mobi/reader.py:745
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:44
 #: /home/kovid/work/calibre/src/calibre/ebooks/odt/input.py:46
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:866
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:871
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:909
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:878
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:883
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:921
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:135
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/reader.py:137
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/jacket.py:86
@@ -236,42 +236,42 @@ msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:69
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:218
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:229
 msgid "This profile is intended for the Microsoft Reader."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:80
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:229
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:240
 msgid "This profile is intended for the Mobipocket books."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:93
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:242
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:253
 msgid "This profile is intended for the Hanlin V3 and its clones."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:105
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:254
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:265
 msgid "This profile is intended for the Cybook G3."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:118
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:267
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:278
 msgid "This profile is intended for the Cybook Opus."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:130
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:279
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:290
 msgid "This profile is intended for the Amazon Kindle."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:142
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:312
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:323
 msgid "This profile is intended for the Irex Illiad."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:154
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:325
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:336
 msgid "This profile is intended for the IRex Digital Reader 1000."
 msgstr ""
 
@@ -284,10 +284,14 @@ msgid "This profile tries to provide sane defaults and is useful if you want to
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/customize/profiles.py:206
+msgid "This profile is intended for the 5-inch JetBook."
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:217
 msgid "This profile is intended for the SONY PRS line. The 500/505/700 etc, in landscape mode. Mainly useful for comics."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:296
+#: /home/kovid/work/calibre/src/calibre/customize/profiles.py:307
 msgid "This profile is intended for the Amazon Kindle DX."
 msgstr ""
 
@@ -379,15 +383,15 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:14
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:70
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:79
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:28
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:27
 msgid "John Schember"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:59
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:63
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:625
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:626
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/scheduler.py:467
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1006
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1010
 #: /home/kovid/work/calibre/src/calibre/library/database2.py:1333
@@ -398,10 +402,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/cybookg3/driver.py:100
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:98
 #: /home/kovid/work/calibre/src/calibre/devices/jetbook/driver.py:100
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:160
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:162
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:143
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:145
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:161
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:163
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:142
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:144
 msgid "Transferring books to device..."
 msgstr ""
 
@@ -411,10 +415,10 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/devices/irexdr/driver.py:57
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:43
 #: /home/kovid/work/calibre/src/calibre/devices/kindle/driver.py:52
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:193
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:200
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:165
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:174
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:194
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:201
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:164
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:173
 msgid "Removing books from device..."
 msgstr ""
 
@@ -452,16 +456,16 @@ msgid "Communicate with the Sony PRS-500 eBook reader."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/prs505/books.py:150
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:85
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:88
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:91
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:102
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:50
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:53
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:56
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:69
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:75
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:79
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:86
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:92
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:103
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:49
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:52
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:55
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:68
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:74
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:78
 msgid "Getting list of books on device..."
 msgstr ""
 
@@ -474,33 +478,33 @@ msgstr ""
 msgid "Kovid Goyal and John Schember"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:79
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:42
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:80
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:41
 msgid "Get device information..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:108
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:110
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:112
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:85
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:87
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:109
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:111
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:113
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:84
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:86
 msgid "The reader has no storage card in this slot."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:133
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:110
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:134
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:109
 msgid "There is insufficient free space in main memory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:135
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:137
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:112
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:114
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:136
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:138
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:111
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:113
 msgid "There is insufficient free space on the storage card"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:228
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:189
+#: /home/kovid/work/calibre/src/calibre/devices/prs505/driver.py:229
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:188
 msgid "Sending metadata to device..."
 msgstr ""
 
@@ -508,47 +512,60 @@ msgstr ""
 msgid "Communicate with the Sony PRS-700 eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:261
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:328
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:262
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:329
 msgid "Unable to detect the %s disk drive. Try rebooting."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:396
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:499
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:397
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:500
 msgid "Unable to detect the %s disk drive."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:486
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:487
 msgid "You must install the pmount package."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:505
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/device.py:506
 msgid "Unable to mount main memory (Error code: %d)"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:11
-msgid "Ordered list of formats the device will accept"
+msgid "Configure Device"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:16
 msgid "settings for device drivers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:27
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:17
+msgid "Ordered list of formats the device will accept"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:18
+msgid "Place files in sub directories if the device supports them"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/deviceconfig.py:19
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:64
+msgid "Read metadata from files on device"
+msgstr ""
+
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:26
 msgid "Communicate with an eBook reader."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:89
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:88
 msgid "Selected slot: %s is not supported."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:152
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:160
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:151
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:159
 msgid "Adding books to device metadata listing..."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:178
-#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:183
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:177
+#: /home/kovid/work/calibre/src/calibre/devices/usbms/driver.py:182
 msgid "Removing books from device metadata listing..."
 msgstr ""
 
@@ -824,7 +841,7 @@ msgid "Transliterate unicode characters to an ASCII representation. Use with car
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:368
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:35
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:37
 msgid "Set the title."
 msgstr ""
 
@@ -841,52 +858,52 @@ msgid "String to be used when sorting by author. "
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:385
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:49
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:51
 msgid "Set the cover to the specified file."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:389
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:51
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:53
 msgid "Set the ebook description."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:393
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:53
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:55
 msgid "Set the ebook publisher."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:397
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:57
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:59
 msgid "Set the series this ebook belongs to."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:401
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:59
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:61
 msgid "Set the index of the book in this series."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:405
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:61
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:63
 msgid "Set the rating. Should be a number between 1 and 5."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:409
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:63
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:65
 msgid "Set the ISBN of the book."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:413
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:65
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:67
 msgid "Set the tags for the book. Should be a comma separated list."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:417
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:67
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:69
 msgid "Set the book producer."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/conversion/plumber.py:421
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:69
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:71
 msgid "Set the language."
 msgstr ""
 
@@ -1236,7 +1253,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1010
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:1070
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:60
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 msgid "Tags"
 msgstr ""
 
@@ -1244,7 +1261,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:166
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:354
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:59
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 msgid "Series"
 msgstr ""
 
@@ -1267,11 +1284,11 @@ msgstr ""
 msgid "Rights"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:9
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:19
 msgid "options"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:10
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:20
 msgid ""
 "\n"
 "Read/Write metadata from/to ebook files.\n"
@@ -1285,59 +1302,59 @@ msgid ""
 "silently ignored.\n"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:37
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:39
 msgid "Set the authors. Multiple authors should be separated by the & character. Author names should be in the order Firstname Lastname."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:41
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:43
 msgid "The version of the title to be used for sorting. If unspecified, and the title is specified, it will be auto-generated from the title."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:45
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:47
 msgid "String to be used when sorting by author. If unspecified, and the author(s) are specified, it will be auto-generated from the author(s)."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:55
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:57
 msgid "Set the book category."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:72
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:74
 msgid "Get the cover from the ebook and save it at as the specified file."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:75
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:77
 msgid "Specify the name of an OPF file. The metadata will be written to the OPF file."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:78
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:80
 msgid "Read metadata from the specified OPF file and use it to set metadata in the ebook. Metadata specified on the command line will override metadata read from the OPF file"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:83
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:85
 msgid "Set the BookID in LRF files"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:141
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:143
 msgid "No file specified"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:156
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:158
 msgid "Original metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:173
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:175
 msgid "Changed metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:185
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:187
 msgid "OPF created in"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:191
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:193
 msgid "Cover saved to"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:193
+#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/cli.py:195
 msgid "No cover found"
 msgstr ""
 
@@ -1395,7 +1412,7 @@ msgid ""
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/opf2.py:1055
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1269
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1281
 msgid "Cover"
 msgstr ""
 
@@ -1424,70 +1441,70 @@ msgstr ""
 msgid "All articles"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1270
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1282
 msgid "Title Page"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1271
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1283
 #: /home/kovid/work/calibre/src/calibre/ebooks/oeb/transforms/htmltoc.py:15
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main.py:48
 #: /home/kovid/work/calibre/src/calibre/gui2/viewer/main_ui.py:168
 msgid "Table of Contents"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1272
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1284
 msgid "Index"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1273
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1285
 msgid "Glossary"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1274
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1286
 msgid "Acknowledgements"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1275
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1287
 msgid "Bibliography"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1276
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1288
 msgid "Colophon"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1277
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1289
 msgid "Copyright"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1278
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1290
 msgid "Dedication"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1279
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1291
 msgid "Epigraph"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1280
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1292
 msgid "Foreword"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1281
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1293
 msgid "List of Illustrations"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1282
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1294
 msgid "List of Tables"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1283
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1295
 msgid "Notes"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1284
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1296
 msgid "Preface"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1285
+#: /home/kovid/work/calibre/src/calibre/ebooks/oeb/base.py:1297
 msgid "Main Text"
 msgstr ""
 
@@ -1942,7 +1959,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/txt_output_ui.py:31
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_edit_ui.py:41
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_wizard_ui.py:67
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:53
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:59
 #: /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
 #: /home/kovid/work/calibre/src/calibre/gui2/wizard/send_email_ui.py:107
@@ -2218,8 +2235,8 @@ msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/metadata_ui.py:170
 #: /home/kovid/work/calibre/src/calibre/gui2/convert/xpath_edit_ui.py:44
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:55
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:56
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:61
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:62
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:491
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:505
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config_ui.py:506
@@ -2867,10 +2884,15 @@ msgid "<p>Cannot upload books to device there is no more free space available "
 msgstr ""
 
 #:
-#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:54
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:60
 msgid "Select available formats and their order for this device"
 msgstr ""
 
+#:
+#: /home/kovid/work/calibre/src/calibre/gui2/device_drivers/configwidget_ui.py:63
+msgid "Use sub directories"
+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
@@ -2887,7 +2909,7 @@ msgstr ""
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:213
 #: /home/kovid/work/calibre/src/calibre/gui2/library.py:344
 #: /home/kovid/work/calibre/src/calibre/gui2/status.py:57
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 msgid "Formats"
 msgstr ""
 
@@ -3029,7 +3051,7 @@ msgid "Access log:"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/config.py:632
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:553
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:554
 msgid "Failed to start content server"
 msgstr ""
 
@@ -4472,7 +4494,7 @@ msgid "Save single format to disk..."
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:138
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:983
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:984
 #: /home/kovid/work/calibre/src/calibre/utils/ipc/job.py:49
 msgid "Error"
 msgstr ""
@@ -4547,7 +4569,7 @@ msgid "Save to disk in a single directory"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:278
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1456
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1457
 msgid "Save only %s format to disk"
 msgstr ""
 
@@ -4581,31 +4603,31 @@ msgid "Bad database location"
 msgstr ""
 
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:424
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1584
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1585
 msgid "Choose a location for your ebook library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:596
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:597
 msgid "Browse by covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:703
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:704
 msgid "Device: "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:705
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:706
 msgid " detected."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:727
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:728
 msgid "Connected "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:739
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:740
 msgid "Device database corrupted"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:740
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:741
 msgid ""
 "\n"
 "                <p>The database of books on the reader is corrupted. Try the following:\n"
@@ -4616,301 +4638,301 @@ msgid ""
 "                "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:816
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:859
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:817
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:860
 msgid "Uploading books to device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
 msgid "Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:826
 msgid "EPUB Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:826
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:827
 msgid "LRF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:827
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:828
 msgid "HTML Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:828
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:829
 msgid "LIT Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:829
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
 msgid "MOBI Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
 msgid "Text books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:831
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:832
 msgid "PDF Books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:832
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:833
 msgid "Comics"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:833
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:834
 msgid "Archives"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:868
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:869
 msgid "Failed to read metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:869
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:870
 msgid "Failed to read metadata from the following"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:887
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:888
 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:914
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:915
 msgid "Deleting books from device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:945
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:946
 msgid "Cannot download metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:946
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:994
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1024
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1049
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1180
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:947
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:995
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1025
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1050
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1181
 msgid "No books selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
 msgid "covers"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:955
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:956
 msgid "metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:957
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:958
 msgid "Downloading %s for %d book(s)"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:978
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:979
 msgid "Failed to download some metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:979
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:980
 msgid "Failed to download metadata for the following:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:982
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:983
 msgid "Failed to download metadata:"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:993
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1023
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:994
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1024
 msgid "Cannot edit metadata"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1048
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1049
 msgid "Cannot save to disk"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1051
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1052
 msgid "Choose destination directory"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1074
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
 msgid "Error while saving"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1075
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1076
 msgid "There was an error while saving."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1079
 #: /home/kovid/work/calibre/src/calibre/gui2/main.py:1080
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1081
 msgid "Could not save some books"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1081
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
 msgid "as the %s format is not available for them."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1082
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1083
 msgid "Click the show details button to see which ones."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1101
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1102
 msgid "Fetching news from "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1114
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1115
 msgid " fetched."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1179
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1180
 msgid "Cannot convert"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1349
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1368
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1369
 msgid "No book selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1349
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1401
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1350
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1402
 msgid "Cannot view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1355
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1356
 msgid "Choose the format to view"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1367
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1368
 msgid "Cannot open folder"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1384
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1385
 msgid "Multiple Books Selected"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1385
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1386
 msgid "You are attempting to open %d books. Opening too many books at once can be slow and have a negative effect on the responsiveness of your computer. Once started the process cannot be stopped until complete. Do you wish to continue?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1402
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1403
 msgid "%s has no available formats."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1440
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
 msgid "Cannot configure"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1441
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1442
 msgid "Cannot configure while there are running jobs."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1485
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
 msgid "No detailed info available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1486
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1487
 msgid "No detailed information is available for books on the device."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1534
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
 msgid "Error talking to device"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1535
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1536
 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:1552
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1567
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1553
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1568
 msgid "Conversion Error"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1553
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1554
 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:1568
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1569
 msgid "<b>Failed</b>"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1593
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1594
 msgid "Invalid library location"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1594
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1595
 msgid "Could not access %s. Using %s as the library."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1642
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1643
 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:1666
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1667
 msgid "There are active jobs. Are you sure you want to quit?"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1669
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1670
 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:1673
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1674
 msgid "WARNING: Active jobs"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1724
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1725
 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:1743
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1744
 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:1751
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
 msgid "Update available"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1752
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1753
 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:1770
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1771
 msgid "Use the library located at the specified path."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1772
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1773
 msgid "Start minimized to system tray."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1774
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1775
 msgid "Log debugging information to console"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1822
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1823
 msgid "If you are sure it is not running"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1824
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1825
 msgid "Cannot Start "
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1825
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1826
 msgid "%s is already running."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1828
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1829
 msgid "may be running in the system tray, in the"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1830
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1831
 msgid "upper right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1832
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1833
 msgid "lower right region of the screen."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1835
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1836
 msgid "try rebooting your computer."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1837
-#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1857
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1838
+#: /home/kovid/work/calibre/src/calibre/gui2/main.py:1858
 msgid "try deleting the file"
 msgstr ""
 
@@ -5087,11 +5109,11 @@ msgstr ""
 msgid "Click to browse books by tags"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 msgid "Authors"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:80
+#: /home/kovid/work/calibre/src/calibre/gui2/tag_view.py:83
 msgid "Publishers"
 msgstr ""
 
@@ -5115,11 +5137,11 @@ msgstr ""
 msgid "Could not convert %d of %d books, because no suitable source format was found."
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:173
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:178
 msgid "You must set a username and password for %s"
 msgstr ""
 
-#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:178
+#: /home/kovid/work/calibre/src/calibre/gui2/tools.py:183
 msgid "Fetch news from "
 msgstr ""